Merge branch 'master' of git://github.com/beedee/OpenRA

2009-12-10 00:41:51 +13:00
parent b060b2ef47 c62298a585
commit 9482789efc
1 changed files with 4 additions and 3 deletions
--- a/OpenRa.Game/Traits/AutoTarget.cs
+++ b/OpenRa.Game/Traits/AutoTarget.cs
@@ -13,9 +13,10 @@ namespace OpenRa.Game.Traits
 		{
 			var attack = self.traits.WithInterface<AttackBase>().First();
 			
-			if (attack.target == null)
-				attack.target = ChooseTarget(self, 
-					Rules.WeaponInfo[self.Info.Primary].Range);
+			var range = Rules.WeaponInfo[self.Info.Primary].Range;
+			if (attack.target == null || 
+				(attack.target.Location - self.Location).LengthSquared > range * range + 2)
+				attack.target = ChooseTarget(self, range);
 		}

 		Actor ChooseTarget(Actor self, float range)