mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Cleaned up location duplication check

Browse Source
This commit is contained in:
aaruel
2019-07-09 21:10:57 -04:00
parent 899b5c136a
commit 4eadbe3c6e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2/ride/Ride.cpp
View File

@@ -7132,15 +7132,16 @@ void sub_6CB945(Ride* ride)
}
}
for (auto locationList = locations.cbegin(); locationList != locations.cend(); locationList++)
auto locationListIter = locations.cbegin();
for (const TileCoordsXYZD& locationCoords : locations)
{
auto locationList2 = locationList;
locationList2++;
auto locationList = ++locationListIter;
bool duplicateLocation = false;
for (; locationList2 != locations.cend(); locationList2++)
while (locationList != locations.cend())
{
if ((*locationList).x == (*locationList2).x && (*locationList).y == (*locationList2).y)
const TileCoordsXYZD& locationCoords2 = *locationList++;
if (locationCoords.x == locationCoords2.x && locationCoords.y == locationCoords2.y)
{
duplicateLocation = true;
break;
@@ -7152,7 +7153,7 @@ void sub_6CB945(Ride* ride)
continue;
}
CoordsXY location = { (*locationList).x * 32, (*locationList).y * 32 };
CoordsXY location = { locationCoords.x * 32, locationCoords.y * 32 };
TileElement* tileElement = map_get_first_element_at(location.x >> 5, location.y >> 5);
do