epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9970 from Sapena/fix_9965_minimap_orders_left_click_control_scheme

Browse Source 
Fixed the minimap orders for left click control
This commit is contained in:
Matthias Mailänder
2015-11-22 16:13:40 +01:00
parent 3727fccd1b 830288b5a0
commit db38d390eb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Widgets/RadarWidget.cs
View File

@@ -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
};