Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions FFXIVClientStructs/FFXIV/Component/GUI/AtkValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
UInt = 0x5,
UInt64 = 0x6,
Float = 0x7,
String = 0x8, // 1 byte per character (ASCII/UTF-8)
WideString = 0x9, // 2 bytes per character (UTF-16)
String8 = 0xA, // assumed to be a const char*
String = 0x8, // char*
WideString = 0x9, // wchar_t* or char16_t*
ConstString = 0xA, // const char*
Vector = 0xB,
Pointer = 0xC,
AtkValues = 0xD,
Expand All @@ -21,6 +21,8 @@
Managed = 0x20,
ManagedString = Managed | String,
ManagedVector = Managed | Vector,

[Obsolete("Renamed to ConstString")] String8 = 0xA,
}

/// <summary>
Expand Down Expand Up @@ -152,7 +154,7 @@
AtkValueType.Float => Float.ToString(),
AtkValueType.String or AtkValueType.ManagedString => String.ToString(),
AtkValueType.WideString => Marshal.PtrToStringUni((nint)WideString) ?? string.Empty,
AtkValueType.String8 => String.ToString(),

Check warning on line 157 in FFXIVClientStructs/FFXIV/Component/GUI/AtkValue.cs

View workflow job for this annotation

GitHub Actions / test

'AtkValueType.String8' is obsolete: 'Renamed to ConstString'

Check warning on line 157 in FFXIVClientStructs/FFXIV/Component/GUI/AtkValue.cs

View workflow job for this annotation

GitHub Actions / build-pr

'AtkValueType.String8' is obsolete: 'Renamed to ConstString'

Check warning on line 157 in FFXIVClientStructs/FFXIV/Component/GUI/AtkValue.cs

View workflow job for this annotation

GitHub Actions / build-pr

'AtkValueType.String8' is obsolete: 'Renamed to ConstString'
AtkValueType.Vector or AtkValueType.ManagedVector => Vector != null ? Vector->ToString() : "null",
AtkValueType.Pointer => $"0x{(nint)Pointer:X}",
AtkValueType.AtkValues => $"0x{(nint)AtkValues:X}",
Expand Down
4 changes: 2 additions & 2 deletions ida/data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2710,8 +2710,8 @@ classes:
0x140636FC0: GetInt
0x140637000: GetUInt # these two could be backwards
0x140637040: GetFloat
0x140637060: GetManagedString
0x140637080: GetString
0x140637060: GetString
0x140637080: GetConstString
0x1406370A0: SetManagedString
0x140637130: Copy # = operator
0x1406371A0: EqualTo # == operator
Expand Down
Loading