From f54b008ac3d11ba0ff4fd27a1db2638d9ecf8231 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Mon, 19 Jul 2021 15:13:19 +0200
Subject: [PATCH] Spin off MapLoc68BABCShouldContinue()

---
 src/openrct2/world/Map.cpp | 57 +++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
index 9d15d4c4fc..28c6075810 100644
--- a/src/openrct2/world/Map.cpp
+++ b/src/openrct2/world/Map.cpp
@@ -1302,6 +1302,39 @@ void map_obstruction_set_error_text(TileElement* tileElement, GameActions::Resul
     }
 }
 
+static bool MapLoc68BABCShouldContinue(
+    TileElement* tileElement, const CoordsXYRangedZ& pos, CLEAR_FUNC clearFunc, uint8_t flags, money32& price,
+    uint8_t crossingMode, bool canBuildCrossing)
+{
+    if (clearFunc != nullptr)
+    {
+        if (!clearFunc(&tileElement, pos, flags, &price))
+        {
+            return true;
+        }
+    }
+
+    // Crossing mode 1: building track over path
+    if (crossingMode == 1 && canBuildCrossing && tileElement->GetType() == TILE_ELEMENT_TYPE_PATH
+        && tileElement->GetBaseZ() == pos.baseZ && !tileElement->AsPath()->IsQueue() && !tileElement->AsPath()->IsSloped())
+    {
+        return true;
+    }
+    // Crossing mode 2: building path over track
+    else if (
+        crossingMode == 2 && canBuildCrossing && tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK
+        && tileElement->GetBaseZ() == pos.baseZ && tileElement->AsTrack()->GetTrackType() == TrackElemType::Flat)
+    {
+        auto ride = get_ride(tileElement->AsTrack()->GetRideIndex());
+        if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SUPPORTS_LEVEL_CROSSINGS))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 /**
  *
  *  rct2: 0x0068B932
@@ -1452,32 +1485,10 @@ std::unique_ptr<GameActions::ConstructClearResult> MapCanConstructWithClearAt(
                     }
                 }
             loc_68BABC:
-                if (clearFunc != nullptr)
-                {
-                    if (!clearFunc(&tileElement, pos, flags, &res->Cost))
-                    {
-                        continue;
-                    }
-                }
-
-                // Crossing mode 1: building track over path
-                if (crossingMode == 1 && canBuildCrossing && tileElement->GetType() == TILE_ELEMENT_TYPE_PATH
-                    && tileElement->GetBaseZ() == pos.baseZ && !tileElement->AsPath()->IsQueue()
-                    && !tileElement->AsPath()->IsSloped())
+                if (MapLoc68BABCShouldContinue(tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing))
                 {
                     continue;
                 }
-                // Crossing mode 2: building path over track
-                else if (
-                    crossingMode == 2 && canBuildCrossing && tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK
-                    && tileElement->GetBaseZ() == pos.baseZ && tileElement->AsTrack()->GetTrackType() == TrackElemType::Flat)
-                {
-                    auto ride = get_ride(tileElement->AsTrack()->GetRideIndex());
-                    if (ride != nullptr && ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_SUPPORTS_LEVEL_CROSSINGS))
-                    {
-                        continue;
-                    }
-                }
 
                 if (tileElement != nullptr)
                 {