From d9dd8a6eceee11c95c4d984c1eabcca355ad8082 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Thu, 9 Jan 2025 14:00:41 +0100 Subject: [PATCH] Move AtkOperationGuide inside AtkStage --- .../FFXIV/Component/GUI/AtkOperationGuide.cs | 18 --------------- .../FFXIV/Component/GUI/AtkStage.cs | 23 ++++++++++++++++--- 2 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs diff --git a/FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs b/FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs deleted file mode 100644 index de56455a9..000000000 --- a/FFXIVClientStructs/FFXIV/Component/GUI/AtkOperationGuide.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace FFXIVClientStructs.FFXIV.Component.GUI; - -[StructLayout(LayoutKind.Explicit, Size = 0x30)] -public unsafe struct AtkOperationGuide { - [FieldOffset(0x00)] public AtkStage* AtkStage; - [FieldOffset(0x08)] private AtkUnitBase* UnkUnitBase1; - [FieldOffset(0x10)] private AtkUnitBase* UnkUnitBase2; - [FieldOffset(0x18)] private byte Unk18; - [FieldOffset(0x19)] private byte Unk19; - [FieldOffset(0x1A)] private byte Unk1A; - [FieldOffset(0x1B)] private byte Unk1B; - [FieldOffset(0x1C)] private short X; - [FieldOffset(0x1E)] private short Y; - [FieldOffset(0x20)] private short Width; - [FieldOffset(0x22)] private short Height; - [FieldOffset(0x24)] private float ScaleX; // result of ScaleX / Scale - [FieldOffset(0x28)] private float Scale; -} diff --git a/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs b/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs index 5f4b83011..c79c8b5b6 100644 --- a/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs +++ b/FFXIVClientStructs/FFXIV/Component/GUI/AtkStage.cs @@ -28,7 +28,7 @@ public unsafe partial struct AtkStage { [FieldOffset(0x168)] public AtkTooltipManager TooltipManager; [FieldOffset(0x2B8)] public DialogueStruct Dialogue; [FieldOffset(0x2F8)] public FilterStruct Filter; - [FieldOffset(0x308)] public AtkOperationGuide AtkOperationGuide; + [FieldOffset(0x308)] public OperationGuideStruct OperationGuide; [FieldOffset(0x338)] public AtkCursor AtkCursor; [FieldOffset(0x358), FixedSizeArray] internal FixedSizeArray32 _atkEventDispatcher; [FieldOffset(0x858)] public uint NextEventDispatcherIndex; @@ -79,7 +79,24 @@ public struct FilterStruct { [FieldOffset(0x00)] public AtkStage* AtkStage; [FieldOffset(0x08)] public short NumActiveSystemFilters; [FieldOffset(0x0A)] public short NumActiveFilters; - [FieldOffset(0x0C)] public short SomeOtherNum; - [FieldOffset(0x0E)] public short SomeAddonId; + [FieldOffset(0x0C)] private short SomeOtherNum; + [FieldOffset(0x0E)] private short SomeAddonId; + } + + [StructLayout(LayoutKind.Explicit, Size = 0x30)] + public unsafe struct OperationGuideStruct { + [FieldOffset(0x00)] public AtkStage* AtkStage; + [FieldOffset(0x08)] private AtkUnitBase* UnkUnitBase1; + [FieldOffset(0x10)] private AtkUnitBase* UnkUnitBase2; + [FieldOffset(0x18)] private byte Unk18; + [FieldOffset(0x19)] private byte Unk19; + [FieldOffset(0x1A)] private byte Unk1A; + [FieldOffset(0x1B)] private byte Unk1B; + [FieldOffset(0x1C)] private short X; + [FieldOffset(0x1E)] private short Y; + [FieldOffset(0x20)] private short Width; + [FieldOffset(0x22)] private short Height; + [FieldOffset(0x24)] private float ScaleX; // result of ScaleX / Scale + [FieldOffset(0x28)] private float Scale; } }