If removing wall overlay, sell it instead if wall owner matches building owner

Author: Starkku

YRpp

@@ -1178,7 +1178,7 @@ ProneSpeed=                   ; floating point value, multiplier, by default, us
 ### Buildable-upon OverlayTypes
 
 - It is now possible to make OverlayTypes allow buildings to be placed on them by setting `CanBeBuiltOn` to true. This still requires the tile's landtype (which is changed to overlay's land type unless OverlayType has `NoUseTileLandType=false`) to allow buildings to be placed.
-  - If `CanBeBuiltOn.Remove=true`, the overlay will be removed upon the building being placed. If this is not set to true, buildings with `Wall=true` cannot be placed on the overlay and neither does overlay with `Wall=true` allow buildings to be placed on itself regardless of other settings.
+  - If `CanBeBuiltOn.Remove=true`, the overlay will be removed (if it is a wall owned by the player placing the building, it is sold) upon the building being placed. If this is not set to true, buildings with `Wall=true` cannot be placed on the overlay and neither does overlay with `Wall=true` allow buildings to be placed on itself regardless of other settings.
 
 In `rulesmd.ini`:
 ```ini

docs/Fixed-or-Improved-Logics.md

@@ -16,11 +16,14 @@ bool OverlayTypeExt::CanBeBuiltOn(int overlayTypeIndex, BuildingTypeClass* pBuil
 	return requireToBeRemovable ? pTypeExt->CanBeBuiltOn_Remove : true;
 }
 
-void OverlayTypeExt::RemoveOverlayFromCell(int overlayTypeIndex, CellClass* pCell)
+void OverlayTypeExt::RemoveOverlayFromCell(int overlayTypeIndex, CellClass* pCell, HouseClass* pSource)
 {
 	if (overlayTypeIndex != -1 && OverlayTypeClass::Array[overlayTypeIndex]->Wall)
 	{
-		pCell->DamageWall(-1);
+		if (pSource && pCell->WallOwnerIndex == pSource->ArrayIndex)
+			pSource->SellWall(pCell->MapCoords, true);
+		else
+			pCell->DamageWall(-1);
 	}
 	else
 	{

src/Ext/OverlayType/Body.cpp

@@ -56,5 +56,5 @@ class OverlayTypeExt
 	static bool SaveGlobals(PhobosStreamWriter& Stm);
 
 	static bool CanBeBuiltOn(int overlayTypeIndex, BuildingTypeClass* pBuildingType, bool requireToBeRemovable);
-	static void RemoveOverlayFromCell(int overlayTypeIndex, CellClass* pCell);
+	static void RemoveOverlayFromCell(int overlayTypeIndex, CellClass* pCell, HouseClass* pSource);
 };

src/Ext/OverlayType/Body.h

@@ -122,7 +122,7 @@ DEFINE_HOOK(0x5684B1, MapClass_PlaceDown_BuildableTerrain, 0x6)
 			auto const pBuildingType = static_cast<BuildingTypeClass*>(pObject->GetType());
 
 			if (OverlayTypeExt::CanBeBuiltOn(overlayTypeIndex, pBuildingType, true))
-				OverlayTypeExt::RemoveOverlayFromCell(overlayTypeIndex, pCell);
+				OverlayTypeExt::RemoveOverlayFromCell(overlayTypeIndex, pCell, pObject->GetOwningHouse());
 		}
 	}