From 80870dcca8e3797014ce56e23eeee68bce843187 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 10 Aug 2013 12:21:28 +1200
Subject: [PATCH] Enable frozen order: DemoAttack.

---
 OpenRA.Mods.RA/DemoTruck.cs | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/OpenRA.Mods.RA/DemoTruck.cs b/OpenRA.Mods.RA/DemoTruck.cs
index 179fabab55..3ae88887dd 100644
--- a/OpenRA.Mods.RA/DemoTruck.cs
+++ b/OpenRA.Mods.RA/DemoTruck.cs
@@ -17,8 +17,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	// Exception when overriding Chronoshift event; removed for now, will look into it.
-	class DemoTruckInfo : TraitInfo<DemoTruck>, Requires<ExplodesInfo> {}
+	class DemoTruckInfo : TraitInfo<DemoTruck>, Requires<ExplodesInfo> { }
 
 	class DemoTruck : IIssueOrder, IResolveOrder, IOrderVoice
 	{
@@ -41,10 +40,13 @@ namespace OpenRA.Mods.RA
 
 		public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
 		{
-			if (order.OrderID == "DemoAttack" || order.OrderID == "DemoDeploy")
-				return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
+			if (order.OrderID != "DemoAttack" && order.OrderID != "DemoDeploy")
+				return null;
 
-			return null;
+			if (target.Type == TargetType.FrozenActor)
+				return new Order(order.OrderID, self, queued) { ExtraData = target.FrozenActor.ID };
+
+			return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
 		}
 
 		public string VoicePhraseForOrder(Actor self, Order order)
@@ -56,13 +58,18 @@ namespace OpenRA.Mods.RA
 		{
 			if (order.OrderString == "DemoAttack")
 			{
-				self.SetTargetLine(Target.FromOrder(order), Color.Red);
-				self.World.AddFrameEndTask(w =>
-				{
-					self.QueueActivity(new MoveAdjacentTo(Target.FromOrder(order)));
-					self.QueueActivity(new CallFunc(() => Explode(self)));
-				});
+				var target = self.ResolveFrozenActorOrder(order, Color.Red);
+				if (target.Type != TargetType.Actor)
+					return;
+
+				if (!order.Queued)
+					self.CancelActivity();
+
+				self.SetTargetLine(target, Color.Red);
+				self.QueueActivity(new MoveAdjacentTo(target));
+				self.QueueActivity(new CallFunc(() => Explode(self)));
 			}
+
 			if (order.OrderString == "DemoDeploy")
 				Explode(self);
 		}