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

Fixed the minimap orders for left click control

Browse Source 
Use the correct actions when orders are issued
over the minimap.
This commit is contained in:
Philipp Schärer
2015-11-11 22:43:51 +01:00
committed by Philipp Schärer
parent f52bbd1b0b
commit 830288b5a0
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 var mi = new MouseInput
{ {
Location = location, Location = location,
Button = MouseButton.Right, Button = Game.Settings.Game.MouseButtonPreference.Action,
Modifiers = Game.GetModifierKeys() Modifiers = Game.GetModifierKeys()
}; };
@@ -243,17 +243,20 @@ namespace OpenRA.Mods.Common.Widgets
var cell = MinimapPixelToCell(mi.Location); var cell = MinimapPixelToCell(mi.Location);
var pos = world.Map.CenterOfCell(cell); 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); 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 // fake a mousedown/mouseup here
var location = worldRenderer.Viewport.WorldToViewPx(worldRenderer.ScreenPxPosition(pos)); var location = worldRenderer.Viewport.WorldToViewPx(worldRenderer.ScreenPxPosition(pos));
var fakemi = new MouseInput var fakemi = new MouseInput
{ {
Event = MouseInputEvent.Down, Event = MouseInputEvent.Down,
Button = MouseButton.Right, Button = Game.Settings.Game.MouseButtonPreference.Action,
Modifiers = mi.Modifiers, Modifiers = mi.Modifiers,
Location = location Location = location
}; };