Merge commit 'pchote/master'

OpenRa.Game/Chrome.cs

@@ -258,7 +258,7 @@ namespace OpenRa.Game
 			else
 			{
 				//repairButton.ReplaceAnim(Game.controller.orderGenerator is RepairOrderGenerator ? "pressed" : "normal");
-				AddButton(chronoshiftRect, isLmb => Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>());
+				AddButton(chronoshiftRect, isLmb => HandleChronosphereButton());
 			}
 			buildPaletteRenderer.DrawSprite(repairButton.Image, chronoshiftDrawPos, PaletteType.Chrome);
 			
@@ -291,6 +291,12 @@ namespace OpenRa.Game
 			buildPaletteRenderer.Flush();
 		}
 		
+		void HandleChronosphereButton()
+		{
+			Sound.Play("slcttgt1.aud");
+			Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>();
+		}
+		
 		void DrawChat()
 		{
 			var chatpos = new int2(400, Game.viewport.Height - 20);

OpenRa.Game/Cursor.cs

@@ -19,6 +19,7 @@ namespace OpenRa.Game
 		public static Cursor Select { get { return new Cursor("select"); } }
 		public static Cursor MoveBlocked { get { return new Cursor("move-blocked"); } }
 		public static Cursor Attack { get { return new Cursor("attack"); } }
+		public static Cursor AttackMove { get { return new Cursor("attackmove"); } }
 		public static Cursor Deploy { get { return new Cursor("deploy"); } }
 		public static Cursor Enter { get { return new Cursor("enter"); } }
 		public static Cursor DeployBlocked { get { return new Cursor("deploy-blocked"); } }

OpenRa.Game/Orders/UnitOrderGenerator.cs

@@ -84,7 +84,7 @@ namespace OpenRa.Game.Orders
 				case "Deliver": return Cursor.Enter;
 				case "Infiltrate": return Cursor.Enter;
 				case "Capture": return Cursor.Capture;
-				case "Harvest": return Cursor.Attack; // TODO: special harvest cursor?
+				case "Harvest": return Cursor.AttackMove;
 				default:
 					return null;
 			}