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

Remove BuildingInfluence from Aircraft.

Browse Source
This commit is contained in:
Paul Chote
2020-10-07 17:52:22 +01:00
committed by Matthias Mailänder
parent 1a3dfdc67f
commit e4faa6b0f0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -1239,7 +1239,6 @@ namespace OpenRA.Mods.Common.Traits
public class AircraftMoveOrderTargeter : IOrderTargeter public class AircraftMoveOrderTargeter : IOrderTargeter
{ {
readonly Aircraft aircraft; readonly Aircraft aircraft;
readonly BuildingInfluence bi;
public string OrderID { get; protected set; } public string OrderID { get; protected set; }
public int OrderPriority { get { return 4; } } public int OrderPriority { get { return 4; } }
@@ -1248,7 +1247,6 @@ namespace OpenRA.Mods.Common.Traits
public AircraftMoveOrderTargeter(Aircraft aircraft) public AircraftMoveOrderTargeter(Aircraft aircraft)
{ {
this.aircraft = aircraft; this.aircraft = aircraft;
bi = aircraft.self.World.WorldActor.TraitOrDefault<BuildingInfluence>();
OrderID = "Move"; OrderID = "Move";
} }
@@ -1273,8 +1271,10 @@ namespace OpenRA.Mods.Common.Traits
// selection for left-mouse orders // selection for left-mouse orders
if (modifiers.HasModifier(TargetModifiers.ForceMove) && aircraft.Info.CanForceLand) if (modifiers.HasModifier(TargetModifiers.ForceMove) && aircraft.Info.CanForceLand)
{ {
var building = bi.GetBuildingAt(location); var buildingAtLocation = self.World.ActorMap.GetActorsAt(location)
if (building == null || building.TraitOrDefault<Selectable>() == null || aircraft.CanLand(location, blockedByMobile: false)) .Any(a => a.TraitOrDefault<Building>() != null && a.TraitOrDefault<Selectable>() != null);
if (!buildingAtLocation || aircraft.CanLand(location, blockedByMobile: false))
OrderID = "Land"; OrderID = "Land";
} }