From af0d4a0b632aa4754cef8040ed8ff1c88b457f62 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 19 Jul 2021 15:14:31 +0200 Subject: [PATCH] Integrate loc_68BABC --- src/openrct2/world/Map.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 28c6075810..875484769e 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -1383,7 +1383,18 @@ std::unique_ptr MapCanConstructWithClearAt( { if (tileElement->GetOccupiedQuadrants() & (quarterTile.GetBaseQuarterOccupied())) { - goto loc_68BABC; + if (MapLoc68BABCShouldContinue( + tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing)) + { + continue; + } + + if (tileElement != nullptr) + { + map_obstruction_set_error_text(tileElement, *res); + res->Error = GameActions::Status::NoClearance; + } + return res; } } continue; @@ -1484,7 +1495,7 @@ std::unique_ptr MapCanConstructWithClearAt( continue; } } - loc_68BABC: + if (MapLoc68BABCShouldContinue(tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing)) { continue;