From c338d28d35e9a811f4720ad9aabe43f0a1a21376 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 25 Oct 2010 09:12:59 +1300 Subject: [PATCH] fix 'decided on Attack but ordered Heal' message on medic --- OpenRA.Mods.RA/AttackBase.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs index dcebe52ab5..79cbc13381 100644 --- a/OpenRA.Mods.RA/AttackBase.cs +++ b/OpenRA.Mods.RA/AttackBase.cs @@ -138,16 +138,16 @@ namespace OpenRA.Mods.RA if( order is AttackOrderTargeter ) { if( target.IsActor ) - return new Order( IsHeal ? "Heal" : "Attack", self, target.Actor ); + return new Order( "Attack", self, target.Actor ); else - return new Order( IsHeal ? "Heal" : "Attack", self, Util.CellContaining( target.CenterLocation ) ); + return new Order( "Attack", self, Util.CellContaining( target.CenterLocation ) ); } return null; } public void ResolveOrder(Actor self, Order order) { - if (order.OrderString == "Attack" || order.OrderString == "Heal") + if (order.OrderString == "Attack") { self.CancelActivity(); QueueAttack(self, Target.FromOrder(order)); @@ -178,7 +178,7 @@ namespace OpenRA.Mods.RA public string VoicePhraseForOrder(Actor self, Order order) { - return (order.OrderString == "Attack" || order.OrderString == "Heal") ? "Attack" : null; + return (order.OrderString == "Attack") ? "Attack" : null; } protected virtual void QueueAttack(Actor self, Target newTarget)