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

Disable multiple-queuing from the keyboard.

Browse Source
This commit is contained in:
Paul Chote
2014-08-02 20:24:03 +12:00
parent 0006f4dd2f
commit e827b343ab
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
View File

@@ -130,10 +130,10 @@ namespace OpenRA.Mods.RA.Widgets
if (mi.Event != MouseInputEvent.Down) if (mi.Event != MouseInputEvent.Down)
return true; return true;
return HandleEvent(icon, mi.Button == MouseButton.Left); return HandleEvent(icon, mi.Button == MouseButton.Left, mi.Modifiers.HasModifier(Modifiers.Shift));
} }
bool HandleEvent(ProductionIcon icon, bool isLeftClick) bool HandleEvent(ProductionIcon icon, bool isLeftClick, bool handleMultiple)
{ {
var actor = World.Map.Rules.Actors[icon.Name]; var actor = World.Map.Rules.Actors[icon.Name];
var first = icon.Queued.FirstOrDefault(); var first = icon.Queued.FirstOrDefault();
@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA.Widgets
Sound.Play(TabClick); Sound.Play(TabClick);
Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, World.LocalPlayer.Country.Race); Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, World.LocalPlayer.Country.Race);
World.IssueOrder(Order.StartProduction(CurrentQueue.Actor, icon.Name, World.IssueOrder(Order.StartProduction(CurrentQueue.Actor, icon.Name,
Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); handleMultiple ? 5 : 1));
} }
else else
Sound.Play(DisabledTabClick); Sound.Play(DisabledTabClick);
@@ -175,7 +175,7 @@ namespace OpenRA.Mods.RA.Widgets
{ {
Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.CancelledAudio, World.LocalPlayer.Country.Race); Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.CancelledAudio, World.LocalPlayer.Country.Race);
World.IssueOrder(Order.CancelProduction(CurrentQueue.Actor, icon.Name, World.IssueOrder(Order.CancelProduction(CurrentQueue.Actor, icon.Name,
Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1)); handleMultiple ? 5 : 1));
} }
else else
{ {
@@ -197,7 +197,7 @@ namespace OpenRA.Mods.RA.Widgets
var hotkey = Hotkey.FromKeyInput(e); var hotkey = Hotkey.FromKeyInput(e);
var toBuild = icons.Values.FirstOrDefault(i => i.Hotkey == hotkey); var toBuild = icons.Values.FirstOrDefault(i => i.Hotkey == hotkey);
return toBuild != null ? HandleEvent(toBuild, true) : false; return toBuild != null ? HandleEvent(toBuild, true, false) : false;
} }
public void RefreshIcons() public void RefreshIcons()