Merge pull request #2452 from KazWolfe/obsolete-fixes

fix: some minor IDE complaints
2026-02-23 00:07:49 +01:00 · 2025-11-11 17:50:32 +01:00 · 2025-11-11 08:28:14 -08:00 · 2025-11-11 07:27:07 -08:00
5 changed files with 7 additions and 8 deletions
--- a/Dalamud/Game/Internal/DalamudCompletion.cs
+++ b/Dalamud/Game/Internal/DalamudCompletion.cs
@ -114,7 +114,7 @@ internal sealed unsafe class DalamudCompletion : IInternalDisposableService
        this.ResetCompletionData();
        this.ClearCachedCommands();

-        var currentText = component->UnkText1.StringPtr.ExtractText();
+        var currentText = component->EvaluatedString.StringPtr.ExtractText();

        var commands = this.commandManager.Commands
            .Where(kv => kv.Value.ShowInHelp && (currentText.Length == 0 || kv.Key.StartsWith(currentText)))
@ -195,7 +195,7 @@ internal sealed unsafe class DalamudCompletion : IInternalDisposableService

        component = (AtkComponentTextInput*)componentBase;

-        addon = component->ContainingAddon;
+        addon = component->OwnerAddon;

        if (addon == null)
            addon = component->ContainingAddon2;
--- a/Dalamud/Interface/Internal/Asserts/AssertHandler.cs
+++ b/Dalamud/Interface/Internal/Asserts/AssertHandler.cs
@ -110,7 +110,6 @@ internal class AssertHandler : IDisposable
        return new StackTrace(frames);
    }

-
    private unsafe void OnImGuiAssert(void* pExpr, void* pFile, int line)
    {
        var expr = Marshal.PtrToStringAnsi(new IntPtr(pExpr));
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@ -414,11 +414,11 @@ internal unsafe class UiDebug
                    var textInputComponent = (AtkComponentTextInput*)compNode->Component;
                    ImGui.Text("InputBase Text1: "u8);
                    ImGui.SameLine();
-                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText1);
+                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.EvaluatedString);

                    ImGui.Text("InputBase Text2: "u8);
                    ImGui.SameLine();
-                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText2);
+                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.RawString);

                    ImGui.Text("Text1: "u8);
                    ImGui.SameLine();
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
@ -90,9 +90,9 @@ internal unsafe class ComponentNodeTree : ResNodeTree
            case TextInput:
                var textInputComponent = (AtkComponentTextInput*)this.Component;
                ImGui.Text(
-                    $"InputBase Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText1.StringPtr))}");
+                    $"InputBase Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.EvaluatedString.StringPtr))}");
                ImGui.Text(
-                    $"InputBase Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText2.StringPtr))}");
+                    $"InputBase Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.RawString.StringPtr))}");
                ImGui.Text(
                    $"Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->UnkText01.StringPtr))}");
                ImGui.Text(
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@ -1 +1 @@
-Subproject commit 2b2d67e374b9f117d3d8038070bd80909de3941d
+Subproject commit f6c479b3fa0b452b44403c8ea53d592bec415e1e
Author	SHA1	Message	Date
goat	93b95fd813	Merge pull request #2452 from KazWolfe/obsolete-fixes Some checks are pending Build Dalamud / Build on Windows (push) Waiting to run Details Build Dalamud / Check API Compatibility (push) Blocked by required conditions Details Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions Details Tag Build / Tag Build (push) Successful in 3s Details fix: some minor IDE complaints	2025-11-11 17:50:32 +01:00
Kaz Wolfe	fe163fbb97	fix: some minor IDE complaints	2025-11-11 08:28:14 -08:00
bleatbot	963b3d9318	Update ClientStructs (#2447 ) Co-authored-by: github-actions[bot] <noreply@github.com>	2025-11-11 07:27:07 -08:00