epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 'decided on Attack but ordered Heal' message on medic

Browse Source
This commit is contained in:
Bob
2010-10-25 09:12:59 +13:00
committed by Chris Forbes
parent 2f962452e5
commit c338d28d35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -138,16 +138,16 @@ namespace OpenRA.Mods.RA
if( order is AttackOrderTargeter ) if( order is AttackOrderTargeter )
{ {
if( target.IsActor ) if( target.IsActor )
return new Order( IsHeal ? "Heal" : "Attack", self, target.Actor ); return new Order( "Attack", self, target.Actor );
else else
return new Order( IsHeal ? "Heal" : "Attack", self, Util.CellContaining( target.CenterLocation ) ); return new Order( "Attack", self, Util.CellContaining( target.CenterLocation ) );
} }
return null; return null;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Attack" || order.OrderString == "Heal") if (order.OrderString == "Attack")
{ {
self.CancelActivity(); self.CancelActivity();
QueueAttack(self, Target.FromOrder(order)); QueueAttack(self, Target.FromOrder(order));
@@ -178,7 +178,7 @@ namespace OpenRA.Mods.RA
public string VoicePhraseForOrder(Actor self, Order order) 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) protected virtual void QueueAttack(Actor self, Target newTarget)