From b9b832ab00c95a731f8472f696c5d026a29fd767 Mon Sep 17 00:00:00 2001 From: Mr-X-GTA <110748953+Mr-X-GTA@users.noreply.github.com> Date: Sun, 4 Aug 2024 17:25:08 +0200 Subject: [PATCH] Minor changes (#184) * feat(netObject): add GetSyncData * fix(CBaseModelInfo): fix m_model_type --- base/CBaseModelInfo.hpp | 20 +++++++------------- network/netObject.hpp | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/base/CBaseModelInfo.hpp b/base/CBaseModelInfo.hpp index f5acebd..8e2d089 100644 --- a/base/CBaseModelInfo.hpp +++ b/base/CBaseModelInfo.hpp @@ -12,18 +12,7 @@ enum class eModelType : std::uint8_t Weapon, Vehicle, Ped, - Destructable, - WorldObject = 33, - Sprinkler = 35, - Unk65 = 65, - EmissiveLOD = 67, - Plant = 129, - LOD = 131, - Unk132 = 132, - Unk133 = 133, - OnlineOnlyPed = 134, - Building = 161, - Unk193 = 193 + Destructable }; #pragma pack(push, 8) @@ -36,9 +25,14 @@ public: char pad_0088[8]; //0x0088 uint64_t unk_0090; //0x0090 char pad_0098[5]; //0x0098 - eModelType m_model_type; //0x009D + uint8_t m_model_type; //0x009D char pad_009E[6]; //0x009E uint64_t unk_00A8; //0x00A8 + + inline eModelType get_model_type() + { + return static_cast(m_model_type & 0x1F); + } }; //Size: 0x00B0 static_assert(sizeof(CBaseModelInfo) == 0xB0); #pragma pack(pop) diff --git a/network/netObject.hpp b/network/netObject.hpp index 459ec1f..a59eb7e 100644 --- a/network/netObject.hpp +++ b/network/netObject.hpp @@ -30,7 +30,7 @@ namespace rage virtual void mov2() = 0; // 0x40 virtual void m_8() = 0; // 0x48 - virtual void m_10() = 0; // 0x50 + virtual class netSyncData* GetSyncData() = 0; // 0x50 virtual void m_18() = 0; // 0x58 virtual void* m_20() = 0; // 0x60 virtual void m_28() = 0; // 0x68