ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(DtrBar): clearer names, no longer assumes static node list size

Browse source
This commit is contained in:
liam 2022-02-07 00:22:40 -05:00
parent f6206bc913
commit 008e83e2f4
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Dalamud/Game/Gui/Dtr/DtrBar.cs
View file

@ -19,7 +19,6 @@ namespace Dalamud.Game.Gui.Dtr
[InterfaceVersion("1.0")] [InterfaceVersion("1.0")]
public sealed unsafe class DtrBar : IDisposable public sealed unsafe class DtrBar : IDisposable
{ {
private const uint BaseNodeCount = 17;
private const uint BaseNodeId = 1000; private const uint BaseNodeId = 1000;
private List<DtrBarEntry> entries = new(); private List<DtrBarEntry> entries = new();
@ -136,9 +135,8 @@ namespace Dalamud.Game.Gui.Dtr
// If we have an unmodified DTR but still have entries, we need to // If we have an unmodified DTR but still have entries, we need to
// work to reset our state. // work to reset our state.
var nodeCount = dtr->UldManager.NodeListCount; if (!this.CheckForDalamudNodes())
if (nodeCount == BaseNodeCount) this.RecreateNodes();
this.Reset();
var collisionNode = dtr->UldManager.NodeList[1]; var collisionNode = dtr->UldManager.NodeList[1];
if (collisionNode == null) return; if (collisionNode == null) return;
@ -199,7 +197,25 @@ namespace Dalamud.Game.Gui.Dtr
} }
} }
private void Reset() /// <summary>
/// Checks if there are any Dalamud nodes in the DTR.
/// </summary>
/// <returns>True if there are nodes with an ID > 1000.</returns>
private bool CheckForDalamudNodes()
{
var dtr = GetDtr();
if (dtr == null || dtr->RootNode == null) return false;
for (int i = 0; i < dtr->UldManager.NodeListCount; i++)
{
if (dtr->UldManager.NodeList[i]->NodeID > 1000)
return true;
}
return false;
}
private void RecreateNodes()
{ {
this.runningNodeIds = BaseNodeId; this.runningNodeIds = BaseNodeId;
foreach (var entry in this.entries) foreach (var entry in this.entries)