From be8f042e49c5f5f900c1efc77d72be79eec9d281 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 30 Nov 2010 22:53:11 +1300
Subject: [PATCH] Fix autoattack target flashes

---
 OpenRA.Mods.RA/AttackBase.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs
index 1526c88cda..afa11d50d6 100644
--- a/OpenRA.Mods.RA/AttackBase.cs
+++ b/OpenRA.Mods.RA/AttackBase.cs
@@ -151,12 +151,12 @@ namespace OpenRA.Mods.RA
 
 		public void ResolveOrder(Actor self, Order order)
 		{
-			if (order.OrderString == "Attack")
-				AttackTarget( Target.FromOrder( order ), order.Queued, true );
-
-			else if(order.OrderString == "AttackHold")
-				AttackTarget( Target.FromOrder( order ), order.Queued, false );
-
+			if (order.OrderString == "Attack" || order.OrderString == "AttackHold")
+			{
+				var target = Target.FromOrder(order);
+				self.SetTargetLine(target, Color.Red);
+				AttackTarget(target, order.Queued, order.OrderString == "Attack");
+			}
 			else
 			{
 				/* hack */
@@ -181,7 +181,6 @@ namespace OpenRA.Mods.RA
 		{
 			if( !target.IsValid ) return;
 			self.QueueActivity(queued, GetAttackActivity(self, target, allowMove));
-			self.SetTargetLine(target, Color.Red);
 		}
 
 		public void ScanAndAttack(Actor self, bool allowMovement, bool holdStill)