add audio feedback for Stop order

This commit is contained in:
Chris Forbes
2011-08-03 19:33:35 +12:00
parent c4666df6b9
commit 5546e977a8

View File

@@ -259,28 +259,28 @@ namespace OpenRA.Mods.RA.Move
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ PerformMove(self, self.World.ClampToWorld(order.TargetLocation),
var target = self.World.ClampToWorld(order.TargetLocation); order.Queued && !self.IsIdle);
PerformMove(self, target, order.Queued && !self.IsIdle);
}
if (order.OrderString == "Stop") if (order.OrderString == "Stop")
{
self.CancelActivity(); self.CancelActivity();
}
if (order.OrderString == "Scatter") if (order.OrderString == "Scatter")
{
OnNudge(self, self, true); OnNudge(self, self, true);
} }
}
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
if (order.OrderString == "Move" || order.OrderString == "Scatter") switch( order.OrderString )
{
case "Move":
case "Scatter":
case "Stop":
return "Move"; return "Move";
default:
return null; return null;
} }
}
public int2 TopLeft { get { return toCell; } } public int2 TopLeft { get { return toCell; } }