From bc0769b101993cd6ea9c6eb4b9f7278c6840d6db Mon Sep 17 00:00:00 2001
From: maybegreat48 <96936658+maybegreat48@users.noreply.github.com>
Date: Sat, 4 Feb 2023 15:17:52 +0000
Subject: [PATCH] Fix classes (#100)

---
 base/fwExtensibleBase.hpp |  9 ---------
 network/snSession.hpp     |  6 +++---
 rage/rlGamerInfoBase.hpp  | 34 +++++++++++++++++++---------------
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/base/fwExtensibleBase.hpp b/base/fwExtensibleBase.hpp
index 5ace695..56d5ed2 100644
--- a/base/fwExtensibleBase.hpp
+++ b/base/fwExtensibleBase.hpp
@@ -16,15 +16,6 @@ namespace rage
 
         fwExtensionContainer* m_extension_container; // 0x0010
         void *m_extensible_unk; // 0x0018
-
-        template <typename T>
-        bool is_of_type()
-        {
-            static auto name = (typeid(T).name()) + 6; // Skip "class "
-            static auto name_hash = joaat(name);
-
-            return is_of_type(name_hash);
-        }
     }; //Size: 0x0020
     static_assert(sizeof(fwExtensibleBase) == 0x20);
 
diff --git a/network/snSession.hpp b/network/snSession.hpp
index 6136925..d13f906 100644
--- a/network/snSession.hpp
+++ b/network/snSession.hpp
@@ -40,9 +40,9 @@ namespace rage
     class rlSession
     {
     public:
-        char pad_0008[256]; //0x0008
-        class rage::rlSessionInfo m_session_info; //0x0108
-        char pad_01D8[296]; //0x01D8
+        char pad_0008[264]; //0x0008
+        class rage::rlSessionInfo m_session_info; //0x0110
+        char pad_01E0[288]; //0x01E0
         uint64_t m_session_id; //0x0300
         char pad_0308[1136]; //0x0308
 
diff --git a/rage/rlGamerInfoBase.hpp b/rage/rlGamerInfoBase.hpp
index e12ab8d..1de12eb 100644
--- a/rage/rlGamerInfoBase.hpp
+++ b/rage/rlGamerInfoBase.hpp
@@ -21,21 +21,25 @@ namespace rage
     class rlGamerInfoBase
     {
     public:
-        char pad_0000[0x60];
-        uint64_t m_peer_id; //0x0000
-        rlGamerHandle m_gamer_handle; //0x008
-        char m_aes_key[32]; //0x0018
-        uint8_t unk_0038; //0x0038
-        netAddress m_unk_ip; //0x003C
-        uint16_t m_unk_port; //0x0040
-        netAddress m_relay_ip; //0x0044
-        uint16_t m_relay_port; //0x0048
-        netAddress m_external_ip; //0x004C
-        uint16_t m_external_port; //0x0050
-        netAddress m_internal_ip; //0x0054
-        uint16_t m_internal_port; //0x0058
-        uint32_t unk_005C; //0x005C
+        char pad_0000[0x8];              //0x0000
+        uint64_t m_peer_id;              //0x0008
+        rlGamerHandle m_gamer_handle;    //0x0010
+        char m_aes_key[0x20];            //0x0020
+        char pad_0040[0x8];              //0x0040
+        netAddress m_unk_ip;             //0x0048
+        uint16_t m_unk_port;             //0x004C
+        netAddress m_relay_ip;           //0x0050
+        uint16_t m_relay_port;           //0x0054
+        char pad_0058[0x12];             //0x0056
+        char pad_0068[0x40];             //0x0068
+        netAddress m_external_ip;        //0x00A8
+        uint16_t m_external_port;        //0x00AC
+        netAddress m_internal_ip;        //0x00B0
+        uint16_t m_internal_port;        //0x00B4
+        char pad_00B6[0x2];              //0x00B6
+        uint32_t unk_00B8;               //0x00B8
+        char pad_00BC[0x4];              //0x00BC
     };
     static_assert(sizeof(rlGamerInfoBase) == 0xC0);
 #pragma pack(pop)
-}
\ No newline at end of file
+}