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

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

Browse source 
fix: some minor IDE complaints
This commit is contained in:
goat 2025-11-11 17:50:32 +01:00 • committed by GitHub
commit 93b95fd813
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Game/Internal/DalamudCompletion.cs
View file

@ -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;

1
Dalamud/Interface/Internal/Asserts/AssertHandler.cs
View file

@ -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));

4
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -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();

4
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
View file

@ -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(