From 43ab6f6f638ff2406c7c0eb8dc371acf0dac6a0c Mon Sep 17 00:00:00 2001 From: MidoriKami <9083275+MidoriKami@users.noreply.github.com> Date: Fri, 23 May 2025 15:44:24 -0700 Subject: [PATCH] UiDebug2 Misc Fixes (#2273) * Fix incorrect type check * Fix address calculation --- Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs | 2 +- Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs index 6c12d3b4c..4440f7d34 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs @@ -86,7 +86,7 @@ internal unsafe partial class ResNodeTree : IDisposable /// An existing or newly-created instance of . internal static ResNodeTree GetOrCreate(AtkResNode* node, AddonTree addonTree) => addonTree.NodeTrees.TryGetValue((nint)node, out var nodeTree) ? nodeTree - : (int)node->Type > 1000 + : (int)node->Type >= 1000 ? new ComponentNodeTree(node, addonTree) : node->Type switch { diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs index 57e5eff99..259d1f827 100644 --- a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs +++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs @@ -78,7 +78,7 @@ public readonly unsafe partial struct TimelineTree { var animation = this.Resource->Animations[a]; var isActive = this.ActiveAnimation != null && &animation == this.ActiveAnimation; - this.PrintAnimation(animation, a, isActive, (nint)(this.NodeTimeline->Resource->Animations + (a * sizeof(AtkTimelineAnimation)))); + this.PrintAnimation(animation, a, isActive, (nint)(this.NodeTimeline->Resource->Animations + a)); } } }