diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs index 41cacc3708..87853ec07d 100755 --- a/OpenRA.Mods.RA/Air/Aircraft.cs +++ b/OpenRA.Mods.RA/Air/Aircraft.cs @@ -204,12 +204,6 @@ namespace OpenRA.Mods.RA.Air return Info.LandableTerrainTypes.Contains(type); } - public void QueueResupplyActivities(Actor a) - { - foreach( var act in GetResupplyActivities(a) ) - self.QueueActivity(act); - } - public IEnumerable GetResupplyActivities(Actor a) { var name = a.Info.Name; diff --git a/OpenRA.Mods.RA/Air/Helicopter.cs b/OpenRA.Mods.RA/Air/Helicopter.cs index 29775fbeb2..d21b01de0e 100755 --- a/OpenRA.Mods.RA/Air/Helicopter.cs +++ b/OpenRA.Mods.RA/Air/Helicopter.cs @@ -78,8 +78,7 @@ namespace OpenRA.Mods.RA.Air self.QueueActivity(new HeliFly(order.TargetActor.Trait().PxPosition + offset)); self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new HeliLand(false)); - - QueueResupplyActivities(order.TargetActor); + self.QueueActivity(new ResupplyAircraft()); } } diff --git a/OpenRA.Mods.RA/Air/Plane.cs b/OpenRA.Mods.RA/Air/Plane.cs index 14ab2ef5fb..9c239618d4 100755 --- a/OpenRA.Mods.RA/Air/Plane.cs +++ b/OpenRA.Mods.RA/Air/Plane.cs @@ -59,8 +59,7 @@ namespace OpenRA.Mods.RA.Air self.CancelActivity(); self.QueueActivity(new ReturnToBase(self, order.TargetActor)); - - QueueResupplyActivities(order.TargetActor); + self.QueueActivity(new ResupplyAircraft()); } else if (order.OrderString == "Stop") { @@ -76,7 +75,7 @@ namespace OpenRA.Mods.RA.Air self.CancelActivity(); self.SetTargetLine(Target.FromActor(airfield), Color.Green); self.QueueActivity(new ReturnToBase(self, airfield)); - QueueResupplyActivities(airfield); + self.QueueActivity(new ResupplyAircraft()); } else { diff --git a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs index 458fe0650d..bf923c67b6 100755 --- a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs +++ b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Air if (airfield != null) { self.QueueActivity(new ReturnToBase(self, airfield)); - self.Trait().QueueResupplyActivities(airfield); + self.QueueActivity(new ResupplyAircraft()); } else {