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

FlyAttack style fixes.

Browse Source
This commit is contained in:
Paul Chote
2013-07-20 19:27:45 +12:00
parent a070629571
commit b92aa760d2
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.RA/Air/FlyAttack.cs
View File

@@ -14,31 +14,32 @@ namespace OpenRA.Mods.RA.Air
{ {
public class FlyAttack : Activity public class FlyAttack : Activity
{ {
readonly Target Target; readonly Target target;
Activity inner; Activity inner;
public FlyAttack(Target target) { Target = target; } public FlyAttack(Target target) { this.target = target; }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if( !Target.IsValid ) if (!target.IsValid)
Cancel(self); Cancel(self);
var limitedAmmo = self.TraitOrDefault<LimitedAmmo>(); var limitedAmmo = self.TraitOrDefault<LimitedAmmo>();
if (limitedAmmo != null && !limitedAmmo.HasAmmo()) if (limitedAmmo != null && !limitedAmmo.HasAmmo())
Cancel(self); Cancel(self);
var attack = self.TraitOrDefault<AttackPlane>(); var attack = self.TraitOrDefault<AttackPlane>();
if (attack != null) if (attack != null)
attack.DoAttack( self, Target ); attack.DoAttack(self, target);
if (inner == null) if (inner == null)
{ {
if (IsCanceled) if (IsCanceled)
return NextActivity; return NextActivity;
inner = Util.SequenceActivities(
Fly.ToPos(Target.CenterPosition), inner = Util.SequenceActivities(Fly.ToPos(target.CenterPosition), new FlyTimed(50));
new FlyTimed(50));
} }
inner = Util.RunActivity(self, inner); inner = Util.RunActivity(self, inner);
return this; return this;
@@ -46,11 +47,8 @@ namespace OpenRA.Mods.RA.Air
public override void Cancel(Actor self) public override void Cancel(Actor self)
{ {
if( !IsCanceled ) if (!IsCanceled && inner != null)
{
if( inner != null )
inner.Cancel(self); inner.Cancel(self);
}
// NextActivity must always be set to null: // NextActivity must always be set to null:
base.Cancel(self); base.Cancel(self);