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

Simplify boolean expressions in ProductionPaletteWidget

Browse Source
This commit is contained in:
Gustas
2022-10-20 13:18:03 +03:00
committed by abcdefg30
parent af3d6792b8
commit e743e6dd61
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -386,8 +386,7 @@ namespace OpenRA.Mods.Common.Widgets
var item = icon.Queued.FirstOrDefault(); var item = icon.Queued.FirstOrDefault();
var handled = btn == MouseButton.Left ? HandleLeftClick(item, icon, startCount, modifiers) var handled = btn == MouseButton.Left ? HandleLeftClick(item, icon, startCount, modifiers)
: btn == MouseButton.Right ? HandleRightClick(item, icon, cancelCount) : btn == MouseButton.Right ? HandleRightClick(item, icon, cancelCount)
: btn == MouseButton.Middle ? HandleMiddleClick(item, icon, cancelCount) : btn == MouseButton.Middle && HandleMiddleClick(item, icon, cancelCount);
: false;
if (!handled) if (!handled)
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Sounds", ClickDisabledSound, null); Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Sounds", ClickDisabledSound, null);
@@ -408,7 +407,7 @@ namespace OpenRA.Mods.Common.Widgets
// HACK: enable production if the shift key is pressed // HACK: enable production if the shift key is pressed
e.Modifiers &= ~Modifiers.Shift; e.Modifiers &= ~Modifiers.Shift;
var toBuild = icons.Values.FirstOrDefault(i => i.Hotkey != null && i.Hotkey.IsActivatedBy(e)); var toBuild = icons.Values.FirstOrDefault(i => i.Hotkey != null && i.Hotkey.IsActivatedBy(e));
return toBuild != null ? HandleEvent(toBuild, MouseButton.Left, batchModifiers) : false; return toBuild != null && HandleEvent(toBuild, MouseButton.Left, batchModifiers);
} }
bool SelectProductionBuilding() bool SelectProductionBuilding()