From 830288b5a0e4e35ea3b646b1505e15b1469f2642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=A4rer?= Date: Wed, 11 Nov 2015 22:43:51 +0100 Subject: [PATCH] Fixed the minimap orders for left click control Use the correct actions when orders are issued over the minimap. --- OpenRA.Mods.Common/Widgets/RadarWidget.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/RadarWidget.cs b/OpenRA.Mods.Common/Widgets/RadarWidget.cs index 4c194f6321..c273c9094c 100644 --- a/OpenRA.Mods.Common/Widgets/RadarWidget.cs +++ b/OpenRA.Mods.Common/Widgets/RadarWidget.cs @@ -222,7 +222,7 @@ namespace OpenRA.Mods.Common.Widgets var mi = new MouseInput { Location = location, - Button = MouseButton.Right, + Button = Game.Settings.Game.MouseButtonPreference.Action, Modifiers = Game.GetModifierKeys() }; @@ -243,17 +243,20 @@ namespace OpenRA.Mods.Common.Widgets var cell = MinimapPixelToCell(mi.Location); var pos = world.Map.CenterOfCell(cell); - if ((mi.Event == MouseInputEvent.Down || mi.Event == MouseInputEvent.Move) && mi.Button == MouseButton.Left) + if ((mi.Event == MouseInputEvent.Down || mi.Event == MouseInputEvent.Move) + && mi.Button == Game.Settings.Game.MouseButtonPreference.Cancel) + { worldRenderer.Viewport.Center(pos); + } - if (mi.Event == MouseInputEvent.Down && mi.Button == MouseButton.Right) + if (mi.Event == MouseInputEvent.Down && mi.Button == Game.Settings.Game.MouseButtonPreference.Action) { // fake a mousedown/mouseup here var location = worldRenderer.Viewport.WorldToViewPx(worldRenderer.ScreenPxPosition(pos)); var fakemi = new MouseInput { Event = MouseInputEvent.Down, - Button = MouseButton.Right, + Button = Game.Settings.Game.MouseButtonPreference.Action, Modifiers = mi.Modifiers, Location = location };