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

Fix key up events queueing duplicate deploy/scatter/stop orders.

Browse Source
This commit is contained in:
Paul Chote
2020-01-25 18:31:09 +00:00
committed by abcdefg30
parent 1e8912b4e4
commit 5c76a6e7a7
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
View File

@@ -207,6 +207,7 @@ namespace OpenRA.Mods.Common.Widgets
if (keyOverrides != null) if (keyOverrides != null)
{ {
var noShiftButtons = new[] { guardButton, deployButton, attackMoveButton }; var noShiftButtons = new[] { guardButton, deployButton, attackMoveButton };
var keyUpButtons = new[] { guardButton, attackMoveButton };
keyOverrides.AddHandler(e => keyOverrides.AddHandler(e =>
{ {
// HACK: allow command buttons to be triggered if the shift (queue order modifier) key is held // HACK: allow command buttons to be triggered if the shift (queue order modifier) key is held
@@ -217,11 +218,20 @@ namespace OpenRA.Mods.Common.Widgets
foreach (var b in noShiftButtons) foreach (var b in noShiftButtons)
{ {
if (b != null && !b.IsDisabled() && b.Key.IsActivatedBy(eNoShift)) // Button is not used by this mod
{ if (b == null)
b.OnKeyPress(e); continue;
return true;
} // Button is not valid for this event
if (b.IsDisabled() || !b.Key.IsActivatedBy(eNoShift))
continue;
// Event is not valid for this button
if (e.Event == KeyInputEvent.Up && !keyUpButtons.Contains(b))
continue;
b.OnKeyPress(e);
return true;
} }
} }