refactor QueueAttack -> GetAttackActivity

OpenRA.Mods.RA/Air/AttackHeli.cs

@@ -22,10 +22,9 @@ namespace OpenRA.Mods.RA.Air
 	{
 		public AttackHeli(Actor self, AttackHeliInfo info) : base(self, info) { }
 
-		protected override void QueueAttack(Actor self, bool queued, Target newTarget)
+		protected override IActivity GetAttackActivity(Actor self, Target newTarget)
 		{
-			target = newTarget;
-			self.QueueActivity(queued, new HeliAttack(newTarget));
+			return new HeliAttack( newTarget );
 		}
 	}
 }

OpenRA.Mods.RA/Air/AttackPlane.cs

@@ -22,10 +22,9 @@ namespace OpenRA.Mods.RA.Air
 	{
 		public AttackPlane(Actor self, AttackPlaneInfo info) : base(self, info) { }
 
-		protected override void QueueAttack(Actor self, bool queued, Target newTarget)
+		protected override IActivity GetAttackActivity(Actor self, Target newTarget)
 		{
-			target = newTarget;
-			self.QueueActivity(queued, new FlyAttack(newTarget));
+			return new FlyAttack( newTarget );
 		}
 
 		protected override bool CanAttack(Actor self)

OpenRA.Mods.RA/Air/FlyAttack.cs

@@ -27,7 +27,9 @@ namespace OpenRA.Mods.RA.Air
 			if( limitedAmmo != null && !limitedAmmo.HasAmmo() )
 				Cancel( self );
 
-			self.Trait<AttackPlane>().DoAttack( self, Target );
+			var attack = self.Trait<AttackPlane>();
+			attack.target = Target;
+			attack.DoAttack( self, Target );
 
 			if( inner == null )
 			{

OpenRA.Mods.RA/Air/HeliAttack.cs

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Air
 				return this;
 			}
 
-			var attack = self.Trait<AttackBase>();
+			var attack = self.Trait<AttackHeli>();
 			var range = attack.GetMaximumRange() - 1;
 			var dist = target.CenterLocation - self.CenterLocation;
 
@@ -46,6 +46,7 @@ namespace OpenRA.Mods.RA.Air
 			if( !float2.WithinEpsilon( float2.Zero, dist, range * Game.CellSize ) )
 				aircraft.TickMove( 1024 * aircraft.MovementSpeed, desiredFacing );
 
+			attack.target = target;
 			attack.DoAttack( self, target );
 
 			return this;