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

Merge pull request #12344 from Ron4u/fixed-issue-12335

Browse Source 
Close #12335: Eliminate goto statement in footpath_chain_ride_queue()
This commit is contained in:
Michael Steenbeek
2020-09-12 18:10:33 +02:00
committed by GitHub
parent eb18a5db81 247de81e3b
commit 12cc413732
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/world/Footpath.cpp
View File

@@ -1082,6 +1082,7 @@ void footpath_chain_ride_queue(
auto targetQueuePos = curQueuePos + CoordsDirectionDelta[direction];
tileElement = map_get_first_element_at(targetQueuePos);
bool foundQueue = false;
if (tileElement != nullptr)
{
do
@@ -1097,7 +1098,8 @@ void footpath_chain_ride_queue(
if (tileElement->AsPath()->GetSlopeDirection() != direction)
break;
}
goto foundNextPath;
foundQueue = true;
break;
}
if (tileElement->GetBaseZ() == baseZ - LAND_HEIGHT_STEP)
{
@@ -1108,13 +1110,14 @@ void footpath_chain_ride_queue(
break;
baseZ -= LAND_HEIGHT_STEP;
goto foundNextPath;
foundQueue = true;
break;
}
} while (!(tileElement++)->IsLastForTile());
}
break;
if (!foundQueue)
break;
foundNextPath:
if (tileElement->AsPath()->IsQueue())
{
// Fix #2051: Stop queue paths that are already connected to two other tiles