From 326cda76cc232deed841de7c468c897e0ca97905 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 3 Jan 2010 22:17:08 +1300
Subject: [PATCH 1/2] Select Target notification for chronosphere

---
 OpenRa.Game/Chrome.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs
index 71e59fd0b7..c9d626ad38 100644
--- a/OpenRa.Game/Chrome.cs
+++ b/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);

From c0509a6f2fa2cfa3fd0adf02b48cea90969beb8e Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 3 Jan 2010 22:29:54 +1300
Subject: [PATCH 2/2] Use correct attack cursors

---
 OpenRa.Game/Cursor.cs                    | 1 +
 OpenRa.Game/Orders/UnitOrderGenerator.cs | 2 +-
 sequences.xml                            | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/OpenRa.Game/Cursor.cs b/OpenRa.Game/Cursor.cs
index 23f380a32e..ee4115a229 100644
--- a/OpenRa.Game/Cursor.cs
+++ b/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"); } }
diff --git a/OpenRa.Game/Orders/UnitOrderGenerator.cs b/OpenRa.Game/Orders/UnitOrderGenerator.cs
index c50379f4e4..ec64b5e9c6 100644
--- a/OpenRa.Game/Orders/UnitOrderGenerator.cs
+++ b/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;
 			}
diff --git a/sequences.xml b/sequences.xml
index 7e8d0a9378..f659cf186a 100644
--- a/sequences.xml
+++ b/sequences.xml
@@ -368,7 +368,7 @@
     <sequence name="move" start="10" length="4" x="12" y="12" />
     <sequence name="move-blocked" start="14" x="12" y="12" />
     <sequence name="select" start="15" length="6" x="12" y="12" />
-    <sequence name="attack" start="21" length="8" x="12" y="12" />
+    <sequence name="attackmove" start="21" length="8" x="12" y="12" />
     <sequence name="move-minimap" start="29" length="6" />
     <sequence name="repair" start="35" length="24" />
     <sequence name="deploy" start="59" length="9" x="12" y="12" />
@@ -384,7 +384,7 @@
     <sequence name="repair-blocked" start="120" length="1" />
     <sequence name="c4-minimap" start="121" length="3" />
     <sequence name="scroll-blocked" start="124" length="8" />
-    <sequence name="attack-minimap" start="134" length="8" />
+    <sequence name="attackmove-minimap" start="134" length="8" />
     <sequence name="enter-minimap" start="142" length="3" />
     <sequence name="guard-minimap" start="146" length="1" />
     <sequence name="guard" start="147" length="1" x="12" y="12" />
@@ -394,8 +394,8 @@
     <sequence name="capture-minimap" start="167" length="3" />
     <sequence name="repair2" start="170" length="24" />
     <sequence name="heal-minimap" start="194" length="1" />
-    <sequence name="attack2" start="195" length="8" x="12" y="12" />
-    <sequence name="attack2-minimap" start="203" length="8" />
+    <sequence name="attack" start="195" length="8" x="12" y="12" />
+    <sequence name="attack-minimap" start="203" length="8" />
     <sequence name="deploy-blocked" start="211" length="1" x="12" y="12" />
     <sequence name="enter-blocked" start="212" length="1" />
     <sequence name="repair2-blocked" start="213" length="1" />