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

rationalize queue cycling

Browse Source
This commit is contained in:
Chris Forbes
2011-05-04 18:56:53 +12:00
parent 71313a264d
commit efaf0208f5
1 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -377,11 +377,9 @@ namespace OpenRA.Mods.RA.Widgets
{ {
Sound.Play(CurrentQueue.Info.CancelledAudio); Sound.Play(CurrentQueue.Info.CancelledAudio);
int numberToCancel = Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1; int numberToCancel = Game.GetModifierKeys().HasModifier(Modifiers.Shift) ? 5 : 1;
if (Game.GetModifierKeys().HasModifier(Modifiers.Shift) &&
Game.GetModifierKeys().HasModifier(Modifiers.Ctrl)) if (Game.GetModifierKeys().HasModifier(Modifiers.Shift | Modifiers.Ctrl))
{
numberToCancel = -1; //cancel all numberToCancel = -1; //cancel all
}
world.IssueOrder(Order.CancelProduction(CurrentQueue.self, item, numberToCancel)); world.IssueOrder(Order.CancelProduction(CurrentQueue.self, item, numberToCancel));
} }
else else
@@ -518,25 +516,12 @@ namespace OpenRA.Mods.RA.Widgets
void TabChange(bool shift) void TabChange(bool shift)
{ {
int size = VisibleQueues.Count(); var queues = VisibleQueues.Concat(VisibleQueues);
if (size > 0) if (shift) queues.Reverse();
{ var nextQueue = queues.SkipWhile( q => q != CurrentQueue )
int current = VisibleQueues.IndexOf(CurrentQueue); .ElementAtOrDefault(1);
if (!shift) if (nextQueue != null)
{ SetCurrentTab( nextQueue );
if (current + 1 >= size)
SetCurrentTab(VisibleQueues.FirstOrDefault());
else
SetCurrentTab(VisibleQueues[current + 1]);
}
else
{
if (current - 1 < 0)
SetCurrentTab(VisibleQueues.LastOrDefault());
else
SetCurrentTab(VisibleQueues[current - 1]);
}
}
} }
} }
} }