diff --git a/network/CNetComplaintMgr.hpp b/network/CNetComplaintMgr.hpp index 866956a..f656cc2 100644 --- a/network/CNetComplaintMgr.hpp +++ b/network/CNetComplaintMgr.hpp @@ -29,7 +29,7 @@ public: char pad_0A64[4]; //0x0A64 uint64_t m_host_tokens_complained[64]; //0x0A68 uint32_t m_num_tokens_complained; //0x0C68 - char pad_0C6C[520]; //0x0C6C + char pad_0C6C[1032]; //0x0C6C uint32_t m_connection_identifier; //0x0E74 uint32_t m_last_resend_time; //0x0E78 char pad_0E7C[4]; //0x0E7C @@ -68,5 +68,5 @@ public: m_num_tokens_complained--; } -}; //Size: 0x0C98 -static_assert(sizeof(CNetComplaintMgr) == 0xE98); \ No newline at end of file +}; //Size: 0x1098 +static_assert(sizeof(CNetComplaintMgr) == 0x1098); \ No newline at end of file diff --git a/network/Network.hpp b/network/Network.hpp index bc99390..e0f2f73 100644 --- a/network/Network.hpp +++ b/network/Network.hpp @@ -210,7 +210,7 @@ public: class rage::rlSessionInfo m_unk_session_info; //0xB408 char pad_B4D8[643]; //0xB4D8 bool m_need_host_change; //0xB753 - char pad_B754[75868]; //0xB754 + char pad_B754[76644]; //0xB754 class rage::rlSessionDetail m_joining_session_detail; //0x1D9A0 class SessionInfoBackup m_last_joined_session; //0x1DE18 char pad_1DEF4[40]; //0x1DEF4 @@ -242,19 +242,20 @@ public: class rage::rlGamerHandle m_inviter_handle; //0x2DCE0 class CNetComplaintMgr m_game_complaint_mgr; //0x2DCF0 class CNetComplaintMgr m_transition_complaint_mgr; //0x2EB88 - - // fields beyond this point are outdated! - - char pad_2FA20[32]; //0x2FA20 - class JoiningPlayerNameMap m_unused_joining_player_name_map; //0x2FA40 - char pad_31048[8]; //0x31048 + char pad_309E0[28]; + uint32_t unk_309FC; + uint32_t unk_30A00; // added b3407 + char pad_30A04[10468]; class CNetBlacklist m_blacklist; //0x31050 - char pad_31308[8]; //0x31308 + char pad_32E90[648]; //0x31308 class InvitedGamers m_game_invited_gamers; //0x31310 - char pad_31F98[5888]; //0x31F98 + char pad_31F98[2680]; //0x31F98 class SessionInfoBackup m_last_joined_transition; //0x33698 uint32_t m_activity_max_players; //0x33774 uint32_t m_activity_max_spectators; //0x33778 + + // fields beyond this point are outdated! + char pad_3377C[48]; //0x3377C bool m_do_not_launch_from_join_as_migrated_host; //0x337AC char pad_337AD[7]; //0x337AD @@ -287,7 +288,7 @@ public: uint32_t m_follower_count; //0x49EE0 char pad_49EE4[632]; //0x49EE4 - char pad[6548]; + char pad[2492]; }; //Size: 0x38650 static_assert(sizeof(Network) == 0x4C628); #pragma pack(pop) \ No newline at end of file diff --git a/script/tlsContext.hpp b/script/tlsContext.hpp index be90fb5..1b27e6a 100644 --- a/script/tlsContext.hpp +++ b/script/tlsContext.hpp @@ -12,18 +12,18 @@ namespace rage class tlsContext { public: - char gap0[180]; - std::uint8_t m_unk_byte; // 0xB4 + char gap0[8884]; + std::uint8_t m_unk_byte; // 0x22B4 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 + sysMemAllocator *m_allocator; // 0x22B8 + sysMemAllocator *m_allocator2; // 0x22C0 - Same as 0x22B8 + sysMemAllocator *m_allocator3; // 0x22C8 - Same as 0x22B8 + uint32_t m_console_smth; // 0x22D0 char gapD4[188]; - uint64_t m_unk; // 0x190 - char gap198[1728]; - rage::scrThread* m_script_thread; // 0x858 - bool m_is_script_thread_active; // 0x860 + uint64_t m_unk; // 0x2390 + char gap198[1720]; + rage::scrThread* m_script_thread; // 0x2A50 + bool m_is_script_thread_active; // 0x2A58 #if _WIN32 static tlsContext* get() @@ -33,6 +33,6 @@ namespace rage } #endif }; - static_assert(sizeof(tlsContext) == 0x861); + static_assert(sizeof(tlsContext) == 0x2A59); #pragma pack(pop) } \ No newline at end of file