mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Fix Action Location for SurfaceSetStyle (#12012)

Browse Source 
LocationValid function was not being called in LandSmoothAction. This did not cause issues as the nested call to land set height would check for valid locations.
This commit is contained in:
Duncan
2020-06-20 20:17:52 +01:00
committed by GitHub
parent c1546059ad
commit f204785c5c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/actions/LandSmoothAction.hpp
View File

@@ -113,7 +113,7 @@ private:
money32 totalCost = 0;
// check if we need to start at all
if (!map_is_location_valid(loc) || !map_is_location_valid({ loc.x + stepX, loc.y + stepY }))
if (!LocationValid(loc) || !LocationValid({ loc.x + stepX, loc.y + stepY }))
{
return 0;
}
@@ -149,7 +149,7 @@ private:
nextLoc.y += stepY;
// check if we need to continue after raising the current tile
// this needs to be checked before the tile is changed
if (!map_is_location_valid({ nextLoc.x + stepX, nextLoc.y + stepY }))
if (!LocationValid({ nextLoc.x + stepX, nextLoc.y + stepY }))
{
shouldContinue &= ~0x3;
}
@@ -265,7 +265,7 @@ private:
}
// check if we need to start at all
if (!map_is_location_valid(loc) || !map_is_location_valid({ loc.x + stepX, loc.y + stepY }))
if (!LocationValid(loc) || !LocationValid({ loc.x + stepX, loc.y + stepY }))
{
return 0;
}
@@ -292,7 +292,7 @@ private:
nextLoc.y += stepY;
// check if we need to continue after raising the current tile
// this needs to be checked before the tile is changed
if (!map_is_location_valid({ nextLoc.x + stepX, nextLoc.y + stepY }))
if (!LocationValid({ nextLoc.x + stepX, nextLoc.y + stepY }))
{
shouldContinue = false;
}

3
src/openrct2/actions/SurfaceSetStyleAction.hpp
View File

@@ -194,6 +194,9 @@ public:
{
for (coords.y = validRange.GetTop(); coords.y <= validRange.GetBottom(); coords.y += COORDS_XY_STEP)
{
if (!LocationValid(coords))
continue;
if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode)
{
if (!map_is_location_in_park(coords))