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

Add HotkeyReference.IsActivatedBy method.

Browse Source
This commit is contained in:
Paul Chote
2017-11-05 20:03:27 +00:00
committed by abcdefg30
parent c4237d6a1a
commit 811427adc4
14 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -244,9 +244,7 @@ namespace OpenRA.Mods.Common.Widgets
if (e.Event == KeyInputEvent.Down)
{
var key = Hotkey.FromKeyInput(e);
if (key == SelectAllKey.GetValue() && !World.IsGameOver)
if (SelectAllKey.IsActivatedBy(e) && !World.IsGameOver)
{
// Select actors on the screen which belong to the current player
var ownUnitsOnScreen = SelectActorsOnScreen(World, worldRenderer, null, player).SubsetWithHighestSelectionPriority().ToList();
@@ -263,7 +261,7 @@ namespace OpenRA.Mods.Common.Widgets
World.Selection.Combine(World, ownUnitsOnScreen, false, false);
}
else if (key == SelectSameTypeKey.GetValue() && !World.IsGameOver)
else if (SelectSameTypeKey.IsActivatedBy(e) && !World.IsGameOver)
{
if (!World.Selection.Actors.Any())
return false;