From 5546e977a8b7c36ec57f98fffd0468e20d40e9f0 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 3 Aug 2011 19:33:35 +1200 Subject: [PATCH] add audio feedback for Stop order --- OpenRA.Mods.RA/Move/Mobile.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs index e5929c0988..7e8b1bb7fe 100755 --- a/OpenRA.Mods.RA/Move/Mobile.cs +++ b/OpenRA.Mods.RA/Move/Mobile.cs @@ -259,27 +259,27 @@ namespace OpenRA.Mods.RA.Move public void ResolveOrder(Actor self, Order order) { if (order.OrderString == "Move") - { - var target = self.World.ClampToWorld(order.TargetLocation); - PerformMove(self, target, order.Queued && !self.IsIdle); - } + PerformMove(self, self.World.ClampToWorld(order.TargetLocation), + order.Queued && !self.IsIdle); if (order.OrderString == "Stop") - { self.CancelActivity(); - } if (order.OrderString == "Scatter") - { OnNudge(self, self, true); - } } public string VoicePhraseForOrder(Actor self, Order order) { - if (order.OrderString == "Move" || order.OrderString == "Scatter") - return "Move"; - return null; + switch( order.OrderString ) + { + case "Move": + case "Scatter": + case "Stop": + return "Move"; + default: + return null; + } } public int2 TopLeft { get { return toCell; } }