refactor QueueAttack -> GetAttackActivity

2010-11-13 16:42:13 +13:00
parent 7306de3730
commit 22e61a5700
9 changed files with 26 additions and 31 deletions
--- a/OpenRA.Mods.RA/AttackFrontal.cs
+++ b/OpenRA.Mods.RA/AttackFrontal.cs
@@ -40,15 +40,12 @@ namespace OpenRA.Mods.RA
 			return true;
 		}

-		protected override void QueueAttack(Actor self, bool queued, Target newTarget)
+		protected override IActivity GetAttackActivity(Actor self, Target newTarget)
 		{
 			var weapon = ChooseWeaponForTarget(newTarget);
-
-			if (weapon != null)
-				self.QueueActivity( queued,
-					new Activities.Attack(
-						newTarget, 
-						Math.Max(0, (int)weapon.Info.Range)));
+			if( weapon == null )
+				return null;
+			return new Activities.Attack(newTarget, Math.Max(0, (int)weapon.Info.Range));
 		}
 	}
 }