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

Revert "Fixes AttackMove moving even if an enemy is within range."

Browse Source 
This reverts commit a155c7b7ac.
This commit is contained in:
Paul Chote
2014-12-22 15:17:51 +13:00
parent e212517bbb
commit 488f0d1140
3 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -134,7 +134,7 @@ namespace OpenRA.Mods.RA
return;
self.SetTargetLine(target, Color.Red);
self.QueueActivity(false, AttackTarget(target, true));
AttackTarget(target, order.Queued, true);
}
}
@@ -160,12 +160,15 @@ namespace OpenRA.Mods.RA
public Armament ChooseArmamentForTarget(Target t) { return Armaments.FirstOrDefault(a => a.Weapon.IsValidAgainst(t, self.World, self)); }
public Activity AttackTarget(Target target, bool allowMove)
public void AttackTarget(Target target, bool queued, bool allowMove)
{
if (!target.IsValidFor(self))
return null;
return;
return GetAttackActivity(self, target, allowMove);
if (!queued)
self.CancelActivity();
self.QueueActivity(GetAttackActivity(self, target, allowMove));
}
public bool IsReachableTarget(Target target, bool allowMove)