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

(2/2) #1210 Remove QueueResupplyActivities entirely, just queue ResupplyAircraft

Browse Source
This commit is contained in:
Chris Forbes
2011-12-03 10:15:21 +13:00
parent 7b06e39390
commit a566a372f5
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -204,12 +204,6 @@ namespace OpenRA.Mods.RA.Air
return Info.LandableTerrainTypes.Contains(type); return Info.LandableTerrainTypes.Contains(type);
} }
public void QueueResupplyActivities(Actor a)
{
foreach( var act in GetResupplyActivities(a) )
self.QueueActivity(act);
}
public IEnumerable<Activity> GetResupplyActivities(Actor a) public IEnumerable<Activity> GetResupplyActivities(Actor a)
{ {
var name = a.Info.Name; var name = a.Info.Name;

3
OpenRA.Mods.RA/Air/Helicopter.cs
View File

@@ -78,8 +78,7 @@ namespace OpenRA.Mods.RA.Air
self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset)); self.QueueActivity(new HeliFly(order.TargetActor.Trait<IHasLocation>().PxPosition + offset));
self.QueueActivity(new Turn(Info.InitialFacing)); self.QueueActivity(new Turn(Info.InitialFacing));
self.QueueActivity(new HeliLand(false)); self.QueueActivity(new HeliLand(false));
self.QueueActivity(new ResupplyAircraft());
QueueResupplyActivities(order.TargetActor);
} }
} }

5
OpenRA.Mods.RA/Air/Plane.cs
View File

@@ -59,8 +59,7 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor)); self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity(new ResupplyAircraft());
QueueResupplyActivities(order.TargetActor);
} }
else if (order.OrderString == "Stop") else if (order.OrderString == "Stop")
{ {
@@ -76,7 +75,7 @@ namespace OpenRA.Mods.RA.Air
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(Target.FromActor(airfield), Color.Green); self.SetTargetLine(Target.FromActor(airfield), Color.Green);
self.QueueActivity(new ReturnToBase(self, airfield)); self.QueueActivity(new ReturnToBase(self, airfield));
QueueResupplyActivities(airfield); self.QueueActivity(new ResupplyAircraft());
} }
else else
{ {

2
OpenRA.Mods.RA/Air/ReturnOnIdle.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Air
if (airfield != null) if (airfield != null)
{ {
self.QueueActivity(new ReturnToBase(self, airfield)); self.QueueActivity(new ReturnToBase(self, airfield));
self.Trait<Aircraft>().QueueResupplyActivities(airfield); self.QueueActivity(new ResupplyAircraft());
} }
else else
{ {