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

refactor QueueAttack -> GetAttackActivity

Browse Source
This commit is contained in:
Bob
2010-11-13 16:42:13 +13:00
parent 7306de3730
commit 22e61a5700
9 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,9 @@ namespace OpenRA.Mods.RA
DoAttack( self, target );
}
protected override void QueueAttack( Actor self, bool queued, Target newTarget )
protected override IActivity GetAttackActivity(Actor self, Target newTarget)
{
if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
return;
self.QueueActivity( queued, new AttackActivity( newTarget ) );
return new AttackActivity( newTarget );
}
bool buildComplete = false;
@@ -66,6 +63,9 @@ namespace OpenRA.Mods.RA
{
if( IsCanceled ) return NextActivity;
if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
return this;
var attack = self.Trait<AttackTurreted>();
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
var weapon = attack.ChooseWeaponForTarget(newTarget);