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

pass target to DoAttack

Browse Source
This commit is contained in:
Bob
2010-10-24 01:43:48 +13:00
committed by Chris Forbes
parent c5358f7c82
commit aa0b7bedf0
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ namespace OpenRA.Mods.RA
a();
}
public void DoAttack(Actor self)
public void DoAttack(Actor self, Target target)
{
if( !CanAttack( self ) ) return;
@@ -150,7 +150,7 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "Attack" || order.OrderString == "Heal")
{
self.CancelActivity();
QueueAttack(self, order);
QueueAttack(self, Target.FromOrder(order));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
@@ -181,14 +181,14 @@ namespace OpenRA.Mods.RA
return (order.OrderString == "Attack" || order.OrderString == "Heal") ? "Attack" : null;
}
protected virtual void QueueAttack(Actor self, Order order)
protected virtual void QueueAttack(Actor self, Target newTarget)
{
var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
var weapon = ChooseWeaponForTarget(newTarget);
if (weapon != null)
self.QueueActivity(
new Activities.Attack(
Target.FromOrder(order),
newTarget,
Math.Max(0, (int)weapon.Info.Range)));
}