mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use map iterator for calculate_park_size

This commit is contained in:
IntelOrca 2015-01-22 17:31:58 +00:00
parent 8774731f03
commit 164cf20ea4
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/world/park.c
View File

@ -130,21 +130,18 @@ void park_reset_history()
*/
int park_calculate_size()
{
int tiles, x, y;
rct_map_element *mapElement;
int tiles;
map_element_iterator it;
tiles = 0;
for (y = 0; y < 256; y++) {
for (x = 0; x < 256; x++) {
mapElement = RCT2_ADDRESS(RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS, rct_map_element*)[y * 256 + x];
while (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SURFACE) {
mapElement++;
}
if (mapElement->properties.surface.ownership & 0x30)
map_element_iterator_begin(&it);
do {
if (map_element_get_type(it.element) == MAP_ELEMENT_TYPE_SURFACE) {
if (it.element->properties.surface.ownership & (OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED | OWNERSHIP_OWNED)) {
tiles++;
}
}
}
} while (map_element_iterator_next(&it));
if (tiles != RCT2_GLOBAL(RCT2_ADDRESS_PARK_SIZE, sint16)) {
RCT2_GLOBAL(RCT2_ADDRESS_PARK_SIZE, sint16) = tiles;