Obey order.Queued in DeployTransform. Fixes #4211.

This commit is contained in:
Paul Chote
2013-12-03 18:52:47 +13:00
parent 599faba94e
commit 0948c353e5
2 changed files with 7 additions and 3 deletions

View File

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA
return null; return null;
} }
public void DeployTransform() public void DeployTransform(bool queued)
{ {
var b = self.TraitOrDefault<Building>(); var b = self.TraitOrDefault<Building>();
@@ -79,6 +79,9 @@ namespace OpenRA.Mods.RA
return; return;
} }
if (!queued)
self.CancelActivity();
if (self.HasTrait<IFacing>()) if (self.HasTrait<IFacing>())
self.QueueActivity(new Turn(Info.Facing)); self.QueueActivity(new Turn(Info.Facing));
@@ -92,7 +95,7 @@ namespace OpenRA.Mods.RA
public void ResolveOrder( Actor self, Order order ) public void ResolveOrder( Actor self, Order order )
{ {
if (order.OrderString == "DeployTransform") if (order.OrderString == "DeployTransform")
DeployTransform(); DeployTransform(order.Queued);
} }
} }
} }

View File

@@ -82,7 +82,8 @@ end
Actor.DeployTransform = function(actor) Actor.DeployTransform = function(actor)
Actor.CallFunc(actor, function() Actor.CallFunc(actor, function()
Actor.Trait(actor, "Transforms"):DeployTransform() -- Queue the transform order
Actor.Trait(actor, "Transforms"):DeployTransform(true)
end) end)
end end