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

2015-08-02 12:29:35 +02:00
parent 0efb8fc6f4
commit b1c51cc910
5 changed files with 89 additions and 47 deletions
--- a/OpenRA.Mods.Common/Activities/Air/Fly.cs
+++ b/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;
+		}
+	}
 }