Fix for #6161 queue commands for Plane/Heli (do not ignore Order.Queued in ResolveOrder())

OpenRA.Mods.Common/Activities/Air/Fly.cs

@@ -84,4 +84,26 @@ namespace OpenRA.Mods.Common.Activities
 			yield return target;
 		}
 	}
+
+	public class FlyAndContinueWithCirclesWhenIdle : Fly
+	{
+		public FlyAndContinueWithCirclesWhenIdle(Actor self, Target t)
+			: base(self, t) { }
+
+		public FlyAndContinueWithCirclesWhenIdle(Actor self, Target t, WDist minRange, WDist maxRange)
+			: base(self, t, minRange, maxRange) { }
+
+		public override Activity Tick(Actor self)
+		{
+			var activity = base.Tick(self);
+
+			if (activity == null && !IsCanceled)
+			{
+				self.QueueActivity(new FlyCircle(self));
+				activity = NextActivity;
+			}
+
+			return activity;
+		}
+	}
 }

OpenRA.Mods.Common/Activities/Air/HeliFly.cs

@@ -92,4 +92,30 @@ namespace OpenRA.Mods.Common.Activities
 			yield return target;
 		}
 	}
+
+	public class HeliFlyAndLandWhenIdle : HeliFly
+	{
+		private readonly HelicopterInfo info;
+
+		public HeliFlyAndLandWhenIdle(Actor self, Target t, HelicopterInfo info)
+			: base(self, t)
+		{
+			this.info = info;
+		}
+
+		public override Activity Tick(Actor self)
+		{
+			var activity = base.Tick(self);
+
+			if (activity == null && !IsCanceled && info.LandWhenIdle)
+			{
+				if (info.TurnToLand)
+					self.QueueActivity(new Turn(self, info.InitialFacing));
+				self.QueueActivity(new HeliLand(self, true));
+				activity = NextActivity;
+			}
+
+			return activity;
+		}
+	}
 }

OpenRA.Mods.Common/Activities/Air/TakeOff.cs

@@ -27,6 +27,7 @@ namespace OpenRA.Mods.Common.Activities
 
 		public override Activity Tick(Actor self)
 		{
+			if (NextActivity == null)
 				self.CancelActivity();
 
 			var reservation = aircraft.Reservation;
@@ -43,7 +44,10 @@ namespace OpenRA.Mods.Common.Activities
 			var destination = rp != null ? rp.Location :
 				(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
 
+			if (NextActivity == null)
 				return new AttackMoveActivity(self, move.MoveTo(destination, 1));
+			else
+				return NextActivity;
 		}
 	}
 }

OpenRA.Mods.Common/Traits/Air/Helicopter.cs

@@ -49,12 +49,6 @@ namespace OpenRA.Mods.Common.Traits
 
 		public void ResolveOrder(Actor self, Order order)
 		{
-			if (Reservation != null)
-			{
-				Reservation.Dispose();
-				Reservation = null;
-			}
-
 			if (order.OrderString == "Move")
 			{
 				var cell = self.World.Map.Clamp(order.TargetLocation);
@@ -64,27 +58,19 @@ namespace OpenRA.Mods.Common.Traits
 					return;
 
 				var target = Target.FromCell(self.World, cell);
-
 				self.SetTargetLine(target, Color.Green);
-				self.CancelActivity();
-				self.QueueActivity(new HeliFly(self, target));
 
-				if (Info.LandWhenIdle)
+				if (!order.Queued)
+					UnReserve();
+
+				self.QueueActivity(order.Queued, new HeliFlyAndLandWhenIdle(self, target, Info));
+			}
+			else if (order.OrderString == "Enter")
 			{
-					if (Info.TurnToLand)
+				Action enter = () =>
-						self.QueueActivity(new Turn(self, Info.InitialFacing));
-
-					self.QueueActivity(new HeliLand(self, true));
-				}
-			}
-
-			if (order.OrderString == "Enter")
 				{
 					if (Reservable.IsReserved(order.TargetActor))
-				{
+						self.QueueActivity(order.Queued, new HeliReturn(self));
-					self.CancelActivity();
-					self.QueueActivity(new HeliReturn(self));
-				}
 					else
 					{
 						var res = order.TargetActor.TraitOrDefault<Reservable>();
@@ -96,14 +82,21 @@ namespace OpenRA.Mods.Common.Traits
 
 						self.SetTargetLine(Target.FromActor(order.TargetActor), Color.Green);
 
-					self.CancelActivity();
 						self.QueueActivity(new HeliFly(self, Target.FromPos(order.TargetActor.CenterPosition + offset)));
 						self.QueueActivity(new Turn(self, Info.InitialFacing));
 						self.QueueActivity(new HeliLand(self, false));
 						self.QueueActivity(new ResupplyAircraft(self));
 						self.QueueActivity(new TakeOff(self));
 					}
+				};
+
+				self.QueueActivity(order.Queued, new CallFunc(enter));
+
+				if (!order.Queued)
+					UnReserve();
 			}
+			else
+				UnReserve();
 
 			if (order.OrderString == "ReturnToBase")
 			{

OpenRA.Mods.Common/Traits/Air/Plane.cs

@@ -83,25 +83,22 @@ namespace OpenRA.Mods.Common.Traits
 				if (!explored && !Info.MoveIntoShroud)
 					return;
 
+				if (!order.Queued)
 					UnReserve();
 
 				var target = Target.FromCell(self.World, cell);
 				self.SetTargetLine(target, Color.Green);
-				self.CancelActivity();
+				self.QueueActivity(order.Queued, new FlyAndContinueWithCirclesWhenIdle(self, target));
-				self.QueueActivity(new Fly(self, target));
-				self.QueueActivity(new FlyCircle(self));
 			}
 			else if (order.OrderString == "Enter")
 			{
 				if (Reservable.IsReserved(order.TargetActor)) return;
 
+				if (!order.Queued)
 					UnReserve();
 
 				self.SetTargetLine(Target.FromOrder(self.World, order), Color.Green);
-
+				self.QueueActivity(order.Queued, Util.SequenceActivities(new ReturnToBase(self, order.TargetActor), new ResupplyAircraft(self)));
-				self.CancelActivity();
-				self.QueueActivity(new ReturnToBase(self, order.TargetActor));
-				self.QueueActivity(new ResupplyAircraft(self));
 			}
 			else if (order.OrderString == "Stop")
 			{