make AttackMove use an activity

2010-10-24 02:06:07 +13:00
parent aa0b7bedf0
commit 5d408fe3c7
2 changed files with 32 additions and 24 deletions
--- a/OpenRA.Mods.RA/Activities/FlyAttack.cs
+++ b/OpenRA.Mods.RA/Activities/FlyAttack.cs
@@ -29,10 +29,10 @@ namespace OpenRA.Mods.RA.Activities

 			self.Trait<AttackPlane>().DoAttack( self, Target );

-			if( IsCanceled && inner == null ) return NextActivity;
-
 			if( inner == null )
 			{
+				if( IsCanceled )
+					return NextActivity;
 				inner = Util.SequenceActivities(
 					Fly.ToPx(Target.CenterLocation),
 					new FlyTimed(50));