From 311bb670a222de862f1c2fb05ddd38acaa01e051 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 24 Jan 2010 12:55:35 +1300
Subject: [PATCH] fixed up some chronoshift consistency crap

---
 OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs | 2 +-
 OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs     | 7 +++----
 OpenRa.Game/Traits/ChronoshiftPower.cs                     | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs b/OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs
index 9b5c990fae..a270fe08e9 100644
--- a/OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs
+++ b/OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs
@@ -17,7 +17,7 @@ namespace OpenRa.Orders
 
 		public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Left)
+			if (mi.Button == MouseButton.Right)
 			{
 				Game.controller.CancelInputMode();
 				yield break;
diff --git a/OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs b/OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
index d09de18bbf..50b8ce4edc 100644
--- a/OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
+++ b/OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
@@ -20,7 +20,7 @@ namespace OpenRa.Orders
 
 		IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
 		{
-			if (mi.Button == MouseButton.Left)
+			if (mi.Button == MouseButton.Right)
 			{
 				var loc = mi.Location + Game.viewport.Location;
 				var underCursor = world.FindUnits(loc, loc)
@@ -40,9 +40,8 @@ namespace OpenRa.Orders
 			var hasChronosphere = world.Actors
 				.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<Chronosphere>());
 
-			// HACK: re-enable this
-			//if (!hasChronosphere)
-			//	Game.controller.CancelInputMode();
+			if (!hasChronosphere)
+				Game.controller.CancelInputMode();
 		}
 
 		public void Render( World world ) { }
diff --git a/OpenRa.Game/Traits/ChronoshiftPower.cs b/OpenRa.Game/Traits/ChronoshiftPower.cs
index e79ac8b6e9..82d956fd4d 100644
--- a/OpenRa.Game/Traits/ChronoshiftPower.cs
+++ b/OpenRa.Game/Traits/ChronoshiftPower.cs
@@ -28,10 +28,7 @@ namespace OpenRa.Traits
 		public void ResolveOrder(Actor self, Order order)
 		{
 			if (order.OrderString == "ChronosphereSelect" && self.Owner == self.World.LocalPlayer)
-			{
 				Game.controller.orderGenerator = new ChronoshiftDestinationOrderGenerator(order.TargetActor);
-				Sound.Play("slcttgt1.aud");
-			}
 			
 			if (order.OrderString == "ChronosphereFinish")
 			{