From a326b5a4ec772d7acc1b6b586a9ed1f700c6345c Mon Sep 17 00:00:00 2001
From: Yimura <24669514+Yimura@users.noreply.github.com>
Date: Wed, 16 Nov 2022 00:39:24 +0100
Subject: [PATCH] fix: tlsContext offsets (#72)

---
 script/tlsContext.hpp | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/script/tlsContext.hpp b/script/tlsContext.hpp
index 00c6673..1a774f0 100644
--- a/script/tlsContext.hpp
+++ b/script/tlsContext.hpp
@@ -2,16 +2,37 @@
 #include "../rage/sysMemAllocator.hpp"
 #include "scrThread.hpp"
 
+#if _WIN32
+#include <intrin.h>
+#endif
+
 namespace rage
 {
+#pragma pack(push, 1)
     class tlsContext
     {
     public:
-        char m_padding1[0xC8]; // 0x00
-        sysMemAllocator* m_allocator; // 0xC8
-        char m_padding2[0x758]; // 0xD0
-        scrThread* m_script_thread; // 0x828
-        bool m_is_script_thread_active; // 0x830
+        char gap0[180];
+        std::uint8_t m_unk_byte; // 0xB4
+        char gapB5[3];
+        sysMemAllocator *m_allocator; // 0xB8
+        sysMemAllocator *m_allocator2; // 0xC0 - Same as 0xB8
+        sysMemAllocator *m_allocator3; // 0xC8 - Same as 0xB8
+        uint32_t m_console_smth; // 0xD0
+        char gapD4[188];
+        uint64_t m_unk; // 0x190
+        char gap198[1712];
+        rage::scrThread *m_script_thread; // 0x848
+        bool m_is_script_thread_active; // 0x850
+
+#if _WIN32
+        static tlsContext* get()
+        {
+            constexpr std::uint32_t TlsIndex = 0x0;
+            return *reinterpret_cast<tlsContext**>(__readgsqword(0x58) + TlsIndex);
+        }
+#endif
     };
-    static_assert(sizeof(tlsContext) == 0x838);
+    static_assert(sizeof(tlsContext) == 0x851);
+#pragma pack(pop)
 }
\ No newline at end of file