epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building bibs not blocking placement.

Browse Source
This commit is contained in:
Paul Chote
2020-11-27 14:45:02 +00:00
parent 25071b813e
commit 5a2f91be1c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs
View File

@@ -53,8 +53,9 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
// Replacements are enabled and the cell contained at least one (not ignored) actor // Replacements are enabled and the cell contained at least one (not ignored) actor or building bib
if (foundActors) var building = world.WorldActor.Trait<BuildingInfluence>().GetBuildingAt(cell);
if (foundActors || building != null)
{ {
// The cell contains at least one actor, and none were replaceable // The cell contains at least one actor, and none were replaceable
if (acceptedReplacements == null) if (acceptedReplacements == null)
@@ -68,6 +69,14 @@ namespace OpenRA.Mods.Common.Traits
return false; return false;
} }
} }
else
{
// HACK: To preserve legacy behaviour, AllowInvalidPlacement should display red placement indicators
// if (and only if) there is a building or bib in the cell
var building = world.WorldActor.Trait<BuildingInfluence>().GetBuildingAt(cell);
if (building != null)
return false;
}
// Buildings can never be placed on ramps // Buildings can never be placed on ramps
return world.Map.Ramp[cell] == 0 && bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(cell).Type); return world.Map.Ramp[cell] == 0 && bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(cell).Type);