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/AttackTurreted.cs
View File

@@ -42,23 +42,23 @@ namespace OpenRA.Mods.RA
public override void Tick(Actor self)
{
base.Tick(self);
DoAttack( self );
DoAttack( self, target );
}
protected override void QueueAttack( Actor self, Order order )
protected override void QueueAttack( Actor self, Target newTarget )
{
if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
return;
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
var weapon = ChooseWeaponForTarget(newTarget);
if (weapon == null)
return;
target = Target.FromOrder(order);
target = newTarget;
if (self.HasTrait<Mobile>() && !self.Info.Traits.Get<MobileInfo>().OnRails)
self.QueueActivity( new Follow( target,
self.QueueActivity( new Follow( newTarget,
Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ) );
}