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

Only play queued notification if queue is empty.

Browse Source 
This matches the behaviour of the RA2 sidebar.
This commit is contained in:
Paul Chote
2019-01-19 22:53:09 +00:00
parent 8d276ff9de
commit 64c853a4e0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,6 +275,7 @@ namespace OpenRA.Mods.Common.Widgets
{ {
// Resume a paused item // Resume a paused item
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Sounds", ClickSound, null); Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Sounds", ClickSound, null);
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", CurrentQueue.Info.QueuedAudio, World.LocalPlayer.Faction.InternalName);
World.IssueOrder(Order.PauseProduction(CurrentQueue.Actor, icon.Name, false)); World.IssueOrder(Order.PauseProduction(CurrentQueue.Actor, icon.Name, false));
return true; return true;
} }
@@ -288,7 +289,7 @@ namespace OpenRA.Mods.Common.Widgets
string notification; string notification;
var canQueue = CurrentQueue.CanQueue(buildable, out notification); var canQueue = CurrentQueue.CanQueue(buildable, out notification);
if (!CurrentQueue.AllQueued().Any(qi => qi.Item == icon.Name && !qi.Paused && qi.Infinite)) if (!CurrentQueue.AllQueued().Any())
Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", notification, World.LocalPlayer.Faction.InternalName); Game.Sound.PlayNotification(World.Map.Rules, World.LocalPlayer, "Speech", notification, World.LocalPlayer.Faction.InternalName);
if (canQueue) if (canQueue)