Fix #22654: Port element removal fixes from #19740 into parkpatch (#22761)

src/openrct2/rct12/ScenarioPatcher.cpp

@@ -62,6 +62,10 @@ static const std::string _typeKey = "type";
 static const std::string _surfacesKey = "surfaces";
 static const std::string _destinationSurface = "to_surface";
 
+// Elements to be removed keys
+static const std::string _elementsToDelete = "elements_to_delete";
+static const std::string _element_index = "element_index";
+
 // Ride fix keys
 static const std::string _ridesKey = "rides";
 static const std::string _rideIdKey = "id";
@@ -364,6 +368,56 @@ static void ApplySurfaceFixes(const json_t& scenarioPatch)
     }
 }
 
+static void RemoveTileElements(const json_t& scenarioPatch)
+{
+    if (!scenarioPatch.contains(_elementsToDelete))
+    {
+        return;
+    }
+
+    if (!scenarioPatch[_elementsToDelete].is_array())
+    {
+        OpenRCT2::Guard::Assert(0, "Elements to delete should be an array");
+        return;
+    }
+
+    auto elementsToDelete = OpenRCT2::Json::AsArray(scenarioPatch[_elementsToDelete]);
+    if (elementsToDelete.empty())
+    {
+        OpenRCT2::Guard::Assert(0, "Elements to delete should not be empty");
+        return;
+    }
+
+    for (size_t i = 0; i < elementsToDelete.size(); ++i)
+    {
+        if (!elementsToDelete[i].contains(_element_index))
+        {
+            OpenRCT2::Guard::Assert(0, "Elements to delete sub-array should set an element_index");
+            return;
+        }
+        auto elementIndex = elementsToDelete[i][_element_index];
+        auto coordinatesVector = getCoordinates(elementsToDelete[i]);
+        if (_dryRun)
+        {
+            return;
+        }
+
+        for (const auto& tile : coordinatesVector)
+        {
+            auto tileElement = MapGetNthElementAt(tile.ToCoordsXY(), elementIndex);
+            if (tileElement == nullptr)
+            {
+                OpenRCT2::Guard::Assert(0, "Invalid Nth element at tile");
+                return;
+            }
+            else
+            {
+                ClearElementAt(tile.ToCoordsXY(), &tileElement);
+            }
+        }
+    }
+}
+
 static void SwapRideEntranceAndExit(RideId rideId)
 {
     auto ride = GetRide(rideId);
@@ -522,6 +576,7 @@ void OpenRCT2::RCT12::ApplyScenarioPatch(u8string_view scenarioPatchFile, u8stri
     ApplyWaterFixes(scenarioPatch);
     ApplyTileFixes(scenarioPatch);
     ApplySurfaceFixes(scenarioPatch);
+    RemoveTileElements(scenarioPatch);
     ApplyRideFixes(scenarioPatch);
 }
 

src/openrct2/world/Map.cpp

@@ -1414,7 +1414,7 @@ void MapExtendBoundarySurfaceX()
  * Clears the provided element properly from a certain tile, and updates
  * the pointer (when needed) passed to this function to point to the next element.
  */
-static void ClearElementAt(const CoordsXY& loc, TileElement** elementPtr)
+void ClearElementAt(const CoordsXY& loc, TileElement** elementPtr)
 {
     TileElement* element = *elementPtr;
     switch (element->GetType())

src/openrct2/world/Map.h

@@ -217,6 +217,7 @@ int32_t MapGetCornerHeight(int32_t z, int32_t slope, int32_t direction);
 int32_t TileElementGetCornerHeight(const SurfaceElement* surfaceElement, int32_t direction);
 
 void MapClearAllElements();
+void ClearElementAt(const CoordsXY& loc, TileElement** elementPtr);
 
 LargeSceneryElement* MapGetLargeScenerySegment(const CoordsXYZD& sceneryPos, int32_t sequence);
 std::optional<CoordsXYZ> MapLargeSceneryGetOrigin(