Updated fwEntity to add an extra class and improved netObject (#19)

Co-authored-by: Yimura <andreas.maerten@scarlet.be>
2024-12-22 14:37:31 +08:00 · 2022-08-08 15:52:41 -04:00 · 2022-08-08 15:52:41 -04:00 · 0f1906a9f7
commit 0f1906a9f7
parent 8675cd7db8
3 changed files with 123 additions and 103 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,10 @@
 .vscode
+*.suo
+*.db
+*.db-shm
+*.db-wal
+*.opendb
+*.sln
+*.vcxproj
+*.user
+*.filters
--- a/base/CObject.hpp
+++ b/base/CObject.hpp
@ -0,0 +1,6 @@
+#pragma once
+#include "rage/fwEntity.hpp"
+
+class CObject : public rage::fwEntity
+{}; //Size: 0x018C
+static_assert(sizeof(CObject) == 0x018C);
--- a/network/netObject.hpp
+++ b/network/netObject.hpp
@ -1,7 +1,9 @@
 #pragma once

 #include <cstdint>
+#include "rage/netSyncTree.hpp"

+class CObject;
 namespace rage
 {
    class netObject
@ -18,108 +20,111 @@ namespace rage
        char pad_004E[1]; //0x004E
        bool m_should_not_be_delete; //0x004F

-        virtual ~netObject();
-        virtual void Function1();
-        virtual void Function2();
-        virtual void Function3();
-        virtual void Function4();
-        virtual void Function5();
-        virtual void Function6();
-        virtual void Function7();
-        virtual void Function8();
-        virtual void Function9();
-        virtual void Function10();
-        virtual void Function11();
-        virtual void Function12();
-        virtual void Function13();
-        virtual void Function14();
-        virtual void Function15();
-        virtual void Function16();
-        virtual void Function17();
-        virtual void Function18();
-        virtual void Function19();
-        virtual void Function20();
-        virtual void Function21();
-        virtual void Function22();
-        virtual void Function23();
-        virtual void Function24();
-        virtual void Function25();
-        virtual void Function26();
-        virtual void Function27();
-        virtual void Function28();
-        virtual void Function29();
-        virtual void Function30();
-        virtual void Function31();
-        virtual void Function32();
-        virtual void Function33();
-        virtual void Function34();
-        virtual void Function35();
-        virtual void Function36();
-        virtual void Function37();
-        virtual void Function38();
-        virtual void Function39();
-        virtual void Function40();
-        virtual void Function41();
-        virtual void Function42();
-        virtual void Function43();
-        virtual void Function44();
-        virtual void Function45();
-        virtual void Function46();
-        virtual void Function47();
-        virtual void Function48();
-        virtual void Function49();
-        virtual void Function50();
-        virtual void Function51();
-        virtual void Function52();
-        virtual void Function53();
-        virtual void Function54();
-        virtual void Function55();
-        virtual void Function56();
-        virtual void Function57();
-        virtual void Function58();
-        virtual void Function59();
-        virtual void Function60();
-        virtual void Function61();
-        virtual void Function62();
-        virtual void Function63();
-        virtual void Function64();
-        virtual void Function65();
-        virtual void Function66();
-        virtual void Function67();
-        virtual void Function68();
-        virtual void Function69();
-        virtual void Function70();
-        virtual void Function71();
-        virtual void Function72();
-        virtual void Function73();
-        virtual void Function74();
-        virtual void Function75();
-        virtual void Function76();
-        virtual void Function77();
-        virtual void Function78();
-        virtual void Function79();
-        virtual void Function80();
-        virtual void Function81();
-        virtual void Function82();
-        virtual void Function83();
-        virtual void Function84();
-        virtual void Function85();
-        virtual void Function86();
-        virtual void Function87();
-        virtual void Function88();
-        virtual void Function89();
-        virtual void Function90();
-        virtual void Function91();
-        virtual void Function92();
-        virtual void Function93();
-        virtual void Function94();
-        virtual void Function95();
-        virtual void Function96();
-        virtual void Function97();
-        virtual void Function98();
-        virtual void Function99();
-        virtual void Function100();
-        virtual void Function101();
+		virtual ~netObject() = 0;
+		virtual void mov1() = 0;
+		virtual void mov2() = 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 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;
    }; //Size: 0x0050
    static_assert(sizeof(netObject) == 0x50);
-}
+}