mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 19:25:12 +01:00
Code Issues Releases Wiki Activity

Refactor tile access to be continuous when iterating

Browse Source
This commit is contained in:
ζeh Matt
2021-12-30 14:03:32 -08:00
committed by GitHub
parent 678dd0f69f
commit 2329d3d681
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/world/Map.cpp
View File

@@ -298,17 +298,17 @@ int32_t tile_element_iterator_next(tile_element_iterator* it)
return 1;
}
if (it->x < (MAXIMUM_MAP_SIZE_TECHNICAL - 1))
if (it->y < (MAXIMUM_MAP_SIZE_TECHNICAL - 1))
{
it->x++;
it->y++;
it->element = map_get_first_element_at(TileCoordsXY{ it->x, it->y });
return 1;
}
if (it->y < (MAXIMUM_MAP_SIZE_TECHNICAL - 1))
if (it->x < (MAXIMUM_MAP_SIZE_TECHNICAL - 1))
{
it->x = 0;
it->y++;
it->y = 0;
it->x++;
it->element = map_get_first_element_at(TileCoordsXY{ it->x, it->y });
return 1;
}
@@ -462,9 +462,9 @@ void map_count_remaining_land_rights()
gLandRemainingOwnershipSales = 0;
gLandRemainingConstructionSales = 0;
for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++)
for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++)
{
for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++)
for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++)
{
auto* surfaceElement = map_get_surface_element_at(TileCoordsXY{ x, y }.ToCoordsXY());
// Surface elements are sometimes hacked out to save some space for other map elements