Added attack move

OpenRA.Game/GameRules/VoiceInfo.cs

@@ -41,6 +41,9 @@ namespace OpenRA.GameRules
 			
 			if (!Voices.ContainsKey("Attack"))
 				Voices.Add("Attack", Voices["Move"]);
+
+			if (!Voices.ContainsKey("AttackMove"))
+				Voices.Add("AttackMove", Voices["Move"]);
 			
 			Pools = Lazy.New(() => Voices.ToDictionary( a => a.Key, a => new VoicePool(a.Value) ));
 		}

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -11,18 +11,26 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
 	public class GenericSelectTarget : IOrderGenerator
 	{
-		readonly Actor subject;
+		readonly IEnumerable<Actor> subjects;
 		readonly string order;
 		readonly string cursor;
 
+		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor)
+		{
+			this.subjects = subjects;
+			this.order = order;
+			this.cursor = cursor;
+		}
+
 		public GenericSelectTarget(Actor subject, string order, string cursor)
 		{
-			this.subject = subject;
+			this.subjects = new Actor[] { subject };
 			this.order = order;
 			this.cursor = cursor;
 		}
@@ -36,16 +44,35 @@ namespace OpenRA.Orders
 
 		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 		{
-			if( mi.Button == MouseButton.Left && world.Map.IsInMap( xy ) )
+			if (mi.Button == MouseButton.Left && world.Map.IsInMap(xy))
 			{
 				world.CancelInputMode();
-				yield return new Order( order, subject, xy );
+				foreach (var subject in subjects)
+					yield return new Order(order, subject, xy);
 			}
 		}
 
 		public virtual void Tick(World world) { }
-		public void RenderAfterWorld(WorldRenderer wr, World world) { }
-		public void RenderBeforeWorld(WorldRenderer wr, World world) { }
+
+		public void RenderBeforeWorld(WorldRenderer wr, World world)
+		{
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPreRenderSelection>())
+						t.RenderBeforeWorld(wr, a);
+
+			Game.Renderer.Flush();
+		}
+
+		public void RenderAfterWorld(WorldRenderer wr, World world)
+		{
+			foreach (var a in world.Selection.Actors)
+				if (!a.Destroyed)
+					foreach (var t in a.TraitsImplementing<IPostRenderSelection>())
+						t.RenderAfterWorld(wr, a);
+
+			Game.Renderer.Flush();
+		}
 
 		public string GetCursor(World world, int2 xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
 	}
@@ -67,5 +94,4 @@ namespace OpenRA.Orders
 				world.CancelInputMode();
 		}
 	}
-
 }

OpenRA.Game/Traits/Mobile.cs

@@ -179,8 +179,9 @@ namespace OpenRA.Traits
 					return;
 				
 				if( !order.Queued ) self.CancelActivity();
+
 				self.QueueActivity(new Activities.Move(currentLocation, 8));
-				
+			
 				if (self.Owner == self.World.LocalPlayer)
 					self.World.AddFrameEndTask(w =>
 					{

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -46,6 +46,7 @@ namespace OpenRA.Widgets
 		}
 		
 		float2 dragStart, dragEnd;
+
 		public override bool HandleInputInner(MouseInput mi)
 		{			
 			var xy = Game.viewport.ViewToWorld(mi);
@@ -139,8 +140,20 @@ namespace OpenRA.Widgets
 					GotoNextBase();
 					return true;
 				}
+
+				if (e.KeyChar == 'a')
+				{
+					StartAttackMoveOrder();
+					return true;
+				}
 			}
 			return false;
+		}
+
+		public void StartAttackMoveOrder()
+		{
+			if (world.Selection.Actors.Count() > 0)
+				world.OrderGenerator = new GenericSelectTarget(world.Selection.Actors, "AttackMove", "attackmove");
 		}
 		
 		public void GotoNextBase()