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

Merge pull request #5911 from pchote/concrete-fix

Browse Source 
Add AllowInvalidPlacement check to IsCellBuildable.
This commit is contained in:
Matthias Mailänder
2014-07-10 13:41:02 +02:00
parent 17310b7234 c6ed6dbeb9
commit e8a7d4d93a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.RA/Buildings/Util.cs
View File

@@ -16,17 +16,18 @@ namespace OpenRA.Mods.RA.Buildings
{ {
public static class BuildingUtils public static class BuildingUtils
{ {
public static bool IsCellBuildable(this World world, CPos a, BuildingInfo bi) public static bool IsCellBuildable(this World world, CPos cell, BuildingInfo bi, Actor toIgnore = null)
{ {
return world.IsCellBuildable(a, bi, null); if (!world.Map.Contains(cell))
} return false;
public static bool IsCellBuildable(this World world, CPos a, BuildingInfo bi, Actor toIgnore) if (world.WorldActor.Trait<BuildingInfluence>().GetBuildingAt(cell) != null)
{ return false;
if (world.WorldActor.Trait<BuildingInfluence>().GetBuildingAt(a) != null) return false;
if (world.ActorMap.GetUnitsAt(a).Any(b => b != toIgnore)) return false;
return world.Map.Contains(a) && bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(a).Type); if (!bi.AllowInvalidPlacement && world.ActorMap.GetUnitsAt(cell).Any(a => a != toIgnore))
return false;
return bi.TerrainTypes.Contains(world.Map.GetTerrainInfo(cell).Type);
} }
public static bool CanPlaceBuilding(this World world, string name, BuildingInfo building, CPos topLeft, Actor toIgnore) public static bool CanPlaceBuilding(this World world, string name, BuildingInfo building, CPos topLeft, Actor toIgnore)