From 2503ddfde44d6b3e61aa3f840b9847cf91c3f286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 16 Jan 2013 22:54:32 +0100 Subject: [PATCH] let Chronotank/Minelayer accept left-click-orders --- OpenRA.Mods.RA/ChronoshiftDeploy.cs | 2 +- OpenRA.Mods.RA/Minelayer.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/ChronoshiftDeploy.cs b/OpenRA.Mods.RA/ChronoshiftDeploy.cs index 23352e00a0..b16ee95697 100644 --- a/OpenRA.Mods.RA/ChronoshiftDeploy.cs +++ b/OpenRA.Mods.RA/ChronoshiftDeploy.cs @@ -112,7 +112,7 @@ namespace OpenRA.Mods.RA public IEnumerable Order(World world, CPos xy, MouseInput mi) { - if (mi.Button == MouseButton.Left) + if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left)) { world.CancelInputMode(); yield break; diff --git a/OpenRA.Mods.RA/Minelayer.cs b/OpenRA.Mods.RA/Minelayer.cs index b3ff8b450e..88356f0031 100644 --- a/OpenRA.Mods.RA/Minelayer.cs +++ b/OpenRA.Mods.RA/Minelayer.cs @@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA public IEnumerable Order(World world, CPos xy, MouseInput mi) { - if (mi.Button == MouseButton.Left) + if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Right : MouseButton.Left)) { world.CancelInputMode(); yield break; @@ -111,7 +111,8 @@ namespace OpenRA.Mods.RA ? a.Info.Traits.Get().Priority : int.MinValue) .FirstOrDefault(); - if( mi.Button == MouseButton.Right && underCursor == null ) + if (mi.Button == (Game.Settings.Game.UseClassicMouseStyle ? MouseButton.Left : MouseButton.Right) + && underCursor == null) { minelayer.World.CancelInputMode(); yield return new Order("PlaceMinefield", minelayer, false) { TargetLocation = xy }; @@ -170,7 +171,7 @@ namespace OpenRA.Mods.RA cursor = "ability"; IsQueued = forceQueued; - return ( actorsAtLocation.Count == 0 && forceAttack ); + return (actorsAtLocation.Count == 0 && forceAttack); } public bool IsQueued { get; protected set; } }