From 0948c353e5730b32a09afbf07defb428330b8b5c Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 3 Dec 2013 18:52:47 +1300
Subject: [PATCH] Obey order.Queued in DeployTransform. Fixes #4211.

---
 OpenRA.Mods.RA/Transforms.cs | 7 +++++--
 mods/ra/lua/actor.lua        | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Mods.RA/Transforms.cs b/OpenRA.Mods.RA/Transforms.cs
index 2cc411ae33..9c158ab3c5 100644
--- a/OpenRA.Mods.RA/Transforms.cs
+++ b/OpenRA.Mods.RA/Transforms.cs
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA
 			return null;
 		}
 
-		public void DeployTransform()
+		public void DeployTransform(bool queued)
 		{
 			var b = self.TraitOrDefault<Building>();
 
@@ -79,6 +79,9 @@ namespace OpenRA.Mods.RA
 				return;
 			}
 
+			if (!queued)
+				self.CancelActivity();
+
 			if (self.HasTrait<IFacing>())
 				self.QueueActivity(new Turn(Info.Facing));
 
@@ -92,7 +95,7 @@ namespace OpenRA.Mods.RA
 		public void ResolveOrder( Actor self, Order order )
 		{
 			if (order.OrderString == "DeployTransform")
-				DeployTransform();
+				DeployTransform(order.Queued);
 		}
 	}
 }
diff --git a/mods/ra/lua/actor.lua b/mods/ra/lua/actor.lua
index 904b6a5be4..b993cdc5bc 100644
--- a/mods/ra/lua/actor.lua
+++ b/mods/ra/lua/actor.lua
@@ -82,7 +82,8 @@ end
 
 Actor.DeployTransform = function(actor)
 	Actor.CallFunc(actor, function()
-		Actor.Trait(actor, "Transforms"):DeployTransform()
+		-- Queue the transform order
+		Actor.Trait(actor, "Transforms"):DeployTransform(true)
 	end)
 end