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

Fix extent of buildable area below structures

Browse Source 
Restore use of GetBuildingAt to take bibs into account for buildable area, and only consult the actor map if the actor at that location is not a building.
This commit is contained in:
Oliver Brakmann
2015-02-10 19:21:49 +01:00
parent 1eb6c984f5
commit 7f4b62b7ee
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,7 @@ namespace OpenRA.Mods.Common.Traits
var scanEnd = world.Map.Clamp(topLeft + buildingMaxBounds + new CVec(Adjacent, Adjacent));
var nearnessCandidates = new List<CPos>();
var bi = world.WorldActor.Trait<BuildingInfluence>();
var allyBuildRadius = world.LobbyInfo.GlobalSettings.AllyBuildRadius;
for (var y = scanStart.Y; y < scanEnd.Y; y++)
@@ -80,11 +81,19 @@ namespace OpenRA.Mods.Common.Traits
{
var pos = new CPos(x, y);
var at = world.ActorMap.GetUnitsAt(pos).Where(a => a.IsInWorld
var buildingAtPos = bi.GetBuildingAt(pos);
if (buildingAtPos == null)
{
var unitsAtPos = world.ActorMap.GetUnitsAt(pos).Where(a => a.IsInWorld
&& (a.Owner == p || (allyBuildRadius && a.Owner.Stances[p] == Stance.Ally))
&& a.HasTrait<GivesBuildableArea>());
if (at.Any())
if (unitsAtPos.Any())
nearnessCandidates.Add(pos);
}
else if (buildingAtPos.IsInWorld && buildingAtPos.HasTrait<GivesBuildableArea>()
&& (buildingAtPos.Owner == p || (allyBuildRadius && buildingAtPos.Owner.Stances[p] == Stance.Ally)))
nearnessCandidates.Add(pos);
}
}