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

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<Activity> GetResupplyActivities(Actor a)
 		{
 			var name = a.Info.Name;

OpenRA.Mods.RA/Air/Helicopter.cs

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

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
 			{

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<Aircraft>().QueueResupplyActivities(airfield);
+				self.QueueActivity(new ResupplyAircraft());
 			}
 			else
 			{