feat(RCS): Improved crash protections. (#407)

Co-authored-by: Yimura <24669514+Yimura@users.noreply.github.com>
2022-11-10 19:21:38 -05:00
parent 5f70975ffe
commit abdb88f68a
6 changed files with 337 additions and 165 deletions
--- a/src/gta/net_object_mgr.hpp
+++ b/src/gta/net_object_mgr.hpp
@ -1,9 +1,9 @@
+#pragma once
 #include "node_list.hpp"
 #include "enums.hpp"
-#include "..\pointers.hpp"
+#include "../pointers.hpp"
 #include "replay.hpp"

-#pragma once

 namespace rage
 {
@ -15,16 +15,6 @@ namespace rage
 		char pad_0010[256]; //0x0010
 	}; //Size: 0x0110

-	class CPlayerAppearanceDataNode
-	{
-	public:
-		char pad_0000[24]; //0x0000
-		CPlayerSyncTree* sync_tree; //0x0018
-		char pad_0020[992]; //0x0020
-		uint32_t model; //0x0400
-		char pad_0404[124]; //0x0404
-	}; //Size: 0x0480
-
 	class CNetworkSyncDataULBase
 	{
 	public:
@ -64,149 +54,7 @@ namespace rage
 		}
 	};

-	class netSyncTree
-	{
-	public:
-		char pad_0000[48]; //0x0000
-		class netSyncTreeNode* m_sync_tree_node; //0x0030
-	}; //Size: 0x0038
-
-	class netSyncTreeNode
-	{
-	public:
-		char pad_0000[192]; //0x0000
-		uint32_t m_player_model; //0x00C0
-		uint32_t m_ped_model; //0x00C4
-		uint32_t m_vehicle_model; //0x00C8
-		char pad_00CC[84]; //0x00CC
-		uint32_t m_pickup_model; //0x0120
-		char pad_0124[44]; //0x0124
-		uint32_t m_object_model; //0x0150
-		char pad_0154[692]; //0x0154
-	}; //Size: 0x0408
-
-	class netObject
-	{
-	public:
-		int16_t object_type; //0x0008
-		int16_t object_id; //0x000A
-		char pad_000C[61]; //0x000C
-		int8_t owner_id; //0x0049
-		int8_t control_id; //0x004A
-		int8_t next_owner_id; //0x004B
-		bool is_remote; //0x004C
-		bool wants_to_delete; //0x004D
-		char pad_004E[1]; //0x004E
-		bool should_not_be_deleted; //0x004F
-		char pad_0050[32]; //0x0050
-		uint32_t players_acked; //0x0070
-		char pad_0074[116]; //0x0074
-
-		virtual ~netObject() = 0;
-
-		virtual void m_8() = 0;
-		virtual void m_10() = 0;
-		virtual void m_18() = 0;
-		virtual void* m_20() = 0;
-		virtual void m_28() = 0;
-		virtual netSyncTree* GetSyncTree() = 0;
-		virtual void m_38() = 0;
-		virtual void m_40() = 0;
-		virtual void m_48() = 0;
-		virtual void m_50() = 0;
-		virtual void m_58() = 0;
-		virtual void m_60() = 0;
-		virtual void m_68() = 0;
-		virtual void m_70() = 0;
-		virtual void m_78() = 0;
-		virtual rage::CObject* GetGameObject() = 0;
-		virtual void m_88() = 0;
-		virtual void m_90() = 0;
-		virtual void m_98() = 0;
-		virtual int GetObjectFlags() = 0;
-		virtual void m_A8() = 0;
-		virtual void m_B0() = 0;
-		virtual void m_B8() = 0;
-		virtual void m_C0() = 0;
-		virtual void m_C8() = 0;
-		virtual int GetSyncFrequency() = 0;
-		virtual void m_D8() = 0;
-		virtual void m_E0() = 0;
-		virtual void m_E8() = 0;
-		virtual void m_F0() = 0;
-		virtual void m_F8() = 0;
-		virtual void Update() = 0;
-		virtual bool m_108_1604() = 0; // added in 1604
-		virtual void m_108() = 0;
-		virtual void m_110() = 0;
-		virtual void m_118() = 0;
-		virtual void m_120() = 0;
-		virtual void m_128() = 0;
-		virtual void m_130() = 0;
-		virtual void m_138() = 0;
-		virtual void m_140() = 0;
-		virtual void m_148() = 0;
-		virtual void m_150() = 0;
-		virtual bool m_158(void* player, int type, int* outReason) = 0;
-		virtual void m_160() = 0;
-		virtual bool m_168(int* outReason) = 0;
-		virtual void m_170() = 0;
-		virtual void m_178() = 0;
-		virtual void m_180() = 0;
-		virtual void m_188() = 0;
-		virtual void m_190() = 0;
-		virtual void m_198() = 0;
-		virtual void m_1A0() = 0;
-		virtual void m_1A8() = 0;
-		virtual void m_1B0() = 0;
-		virtual void m_1B8() = 0;
-		virtual void m_1C0() = 0;
-		virtual void m_1C8() = 0;
-		virtual void m_1D0() = 0;
-		virtual void m_1D8() = 0;
-		virtual void m_1E0() = 0;
-		virtual void m_1E8() = 0;
-		virtual void m_1F0() = 0;
-		virtual void m_1F8() = 0;
-		virtual void m_200() = 0;
-		virtual void m_208() = 0;
-		virtual void m_210() = 0;
-		virtual void m_218() = 0;
-		virtual void m_220() = 0;
-		virtual void m_228() = 0;
-		virtual void m_230() = 0;
-		virtual void m_238() = 0;
-		virtual void m_240() = 0;
-		virtual void m_248() = 0;
-		virtual void m_250() = 0;
-		virtual void m_258() = 0;
-		virtual void m_260() = 0;
-		virtual void m_268() = 0;
-		virtual void m_270() = 0;
-		virtual void m_278() = 0;
-		virtual void m_280() = 0;
-		virtual void m_288() = 0;
-		virtual void m_290() = 0;
-		virtual void m_298() = 0;
-		virtual void m_2A0() = 0;
-		virtual void m_2A8() = 0;
-		virtual void m_2B0() = 0;
-		virtual void m_2B8() = 0;
-		virtual void m_2C0() = 0;
-		virtual void m_2C8() = 0;
-		virtual void m_2D0() = 0;
-		virtual void m_2D8() = 0;
-		virtual void m_2E0() = 0;
-		virtual void m_2E8() = 0;
-		virtual void m_2F0() = 0;
-		virtual void m_2F8() = 0;
-		virtual void m_300() = 0;
-		virtual void m_308() = 0;
-		virtual void m_310() = 0;
-		virtual void m_318() = 0;
-		virtual void m_320() = 0;
-		virtual void UpdatePendingVisibilityChanges() = 0;
-	};
+	class netObject;
 	class CNetGamePlayer;

 	class netObjectMgrBase
@ -265,6 +113,6 @@ class CNetworkObjectMgr : public rage::netObjectMgrBase
 public:
 	rage::netObject* find_object_by_id(std::uint16_t object_id, bool can_delete_be_pending)
 	{
-		return big::g_pointers->m_find_object_by_id(this, object_id, can_delete_be_pending);
-	};
-};
+		return big::g_pointers->m_get_net_object(this, object_id, can_delete_be_pending);
+	}
+};