Merge pull request #731 from Haselnussbomber/update-gamemain

Update GameMain
aers · Jan 5, 2024 · 551efd7 · 551efd7
2 parents 15ba71d + ac52144
commit 551efd7
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/FFXIVClientStructs/FFXIV/Client/Game/GameMain.cs b/FFXIVClientStructs/FFXIV/Client/Game/GameMain.cs
@@ -1,20 +1,31 @@
 namespace FFXIVClientStructs.FFXIV.Client.Game;
 
-[StructLayout(LayoutKind.Explicit, Size = 0x58D0)]
+[StructLayout(LayoutKind.Explicit, Size = 0x40E0)]
 public unsafe partial struct GameMain {
     [FieldOffset(0x0)] public fixed uint ActiveFestivals[4];
 
     [FieldOffset(0x40)] public fixed uint QueuedFestivals[4];
 
     [FieldOffset(0xAD8)] public JobGaugeManager JobGaugeManager;
 
+    [FieldOffset(0x4080)] public uint TerritoryLoadState; // 1 = loading, 2 = loaded, 3 = unloading/shutting down
+    [FieldOffset(0x4084)] public uint NextTerritoryTypeId;
     [FieldOffset(0x4088)] public uint CurrentTerritoryTypeId; // can be 0 during loading screens
     [FieldOffset(0x408C)] public uint CurrentTerritoryIntendedUseId;
 
     [FieldOffset(0x4094)] public ushort CurrentContentFinderConditionId;
 
     [FieldOffset(0x40A0)] public uint CurrentMapId;
 
+    [FieldOffset(0x40B0)] public float MilisecondCounter;
+    [FieldOffset(0x40B4)] public uint RuntimeSeconds;
+    [FieldOffset(0x40B8)] public bool RuntimeSecondsChanged;
+    [FieldOffset(0x40BC)] public float Runtime;
+    [FieldOffset(0x40C0)] public nint CurrentTerritoryTypeRow;
+    [FieldOffset(0x40C8)] public nint CurrentTerritoryIntendedUseRow;
+    [FieldOffset(0x40D0)] public nint NextTerritoryTypeRow;
+    [FieldOffset(0x40D8)] public nint NextTerritoryIntendedUseRow;
+
     [StaticAddress("48 8D 0D ?? ?? ?? ?? 38 05", 3)]
     public static partial GameMain* Instance();