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

Fix ProductionTabsWidget not picking up ProductionQueue getting enabled/disabled during its lifetime

Browse Source
This commit is contained in:
michaeldgg2
2023-10-28 11:23:05 +02:00
committed by abcdefg30
parent b5b16df9e0
commit 507cdf1256
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Widgets
public void Update(IEnumerable<ProductionQueue> allQueues) public void Update(IEnumerable<ProductionQueue> allQueues)
{ {
var queues = allQueues.Where(q => q.Info.Group == Group).ToList(); var queues = allQueues.Where(q => q.Enabled && q.Info.Group == Group).ToList();
var tabs = new List<ProductionTab>(); var tabs = new List<ProductionTab>();
var largestUsedName = 0; var largestUsedName = 0;
@@ -105,6 +105,8 @@ namespace OpenRA.Mods.Common.Widgets
readonly Lazy<ProductionPaletteWidget> paletteWidget; readonly Lazy<ProductionPaletteWidget> paletteWidget;
string queueGroup; string queueGroup;
readonly List<(ProductionQueue Queue, bool Enabled)> cachedProductionQueueEnabledStates = new();
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public ProductionTabsWidget(World world) public ProductionTabsWidget(World world)
{ {
@@ -243,12 +245,16 @@ namespace OpenRA.Mods.Common.Widgets
{ {
if (a.Info.HasTraitInfo<ProductionQueueInfo>()) if (a.Info.HasTraitInfo<ProductionQueueInfo>())
{ {
var allQueues = a.World.ActorsWithTrait<ProductionQueue>() var queues = a.World.ActorsWithTrait<ProductionQueue>()
.Where(p => p.Actor.Owner == p.Actor.World.LocalPlayer && p.Actor.IsInWorld && p.Trait.Enabled) .Where(p => p.Actor.Owner == p.Actor.World.LocalPlayer && p.Actor.IsInWorld)
.Select(p => p.Trait).ToList(); .Select(p => p.Trait);
cachedProductionQueueEnabledStates.Clear();
foreach (var queue in queues)
cachedProductionQueueEnabledStates.Add((queue, queue.Enabled));
foreach (var g in Groups.Values) foreach (var g in Groups.Values)
g.Update(allQueues); g.Update(cachedProductionQueueEnabledStates.Select(t => t.Queue));
if (queueGroup == null) if (queueGroup == null)
return; return;
@@ -268,6 +274,22 @@ namespace OpenRA.Mods.Common.Widgets
{ {
if (leftPressed) Scroll(1); if (leftPressed) Scroll(1);
if (rightPressed) Scroll(-1); if (rightPressed) Scroll(-1);
// It is possible that production queues get enabled/disabled during their lifetime.
// This makes sure every enabled production queue always has its tab associated with it.
var shouldUpdateQueues = false;
foreach (var (queue, enabled) in cachedProductionQueueEnabledStates)
{
if (queue.Enabled != enabled)
{
shouldUpdateQueues = true;
break;
}
}
if (shouldUpdateQueues)
foreach (var g in Groups.Values)
g.Update(cachedProductionQueueEnabledStates.Select(t => t.Queue));
} }
public override bool YieldMouseFocus(MouseInput mi) public override bool YieldMouseFocus(MouseInput mi)