From 99154207de876695e5b38452836843312b1b1efa Mon Sep 17 00:00:00 2001
From: gir489 <poop@fart.com>
Date: Sun, 6 Dec 2020 10:50:34 -0500
Subject: [PATCH] Updated offsets for CPed and CPlayerInfo.

---
 BigBaseV2/src/gta/player.hpp | 60 +++++++++++++++++++-----------------
 BigBaseV2/src/gta/replay.hpp |  8 ++---
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/BigBaseV2/src/gta/player.hpp b/BigBaseV2/src/gta/player.hpp
index a64348d4..c721d1a9 100644
--- a/BigBaseV2/src/gta/player.hpp
+++ b/BigBaseV2/src/gta/player.hpp
@@ -102,39 +102,41 @@ class CPlayerInfo : public rage::fwExtensibleBase
 {
 public:
 	char pad_0020[20]; //0x0020
-	std::uint32_t m_internal_ip; //0x0034
-	std::uint16_t m_internal_port; //0x0038
+	uint32_t m_internal_ip; //0x0034
+	uint16_t m_internal_port; //0x0038
 	char pad_003A[2]; //0x003A
-	std::uint32_t m_relay_ip; //0x003C
-	std::uint16_t m_relay_port; //0x0040
+	uint32_t m_relay_ip; //0x003C
+	uint16_t m_relay_port; //0x0040
 	char pad_0042[2]; //0x0042
-	std::uint32_t m_external_ip; //0x0044
-	std::uint16_t m_external_port; //0x0048
-	char pad_004A[30]; //0x004A
-	std::uint64_t m_rockstar_id; //0x0068
-	char pad_0070[12]; //0x0070
-	char m_name[20]; //0x007C
-	char pad_0090[184]; //0x0090
-	float m_swim_speed; //0x0148
-	float m_run_speed; //0x014C
-	char pad_0150[81]; //0x0150
-	bool m_is_rockstar_dev; //0x01A1
-	char pad_01A2[1]; //0x01A2
-	bool m_is_cheater; //0x01A3
-	char pad_01A4[11]; //0x01A4
-	bool m_is_online; //0x01AF
-	char pad_01B0[24]; //0x01B0
-	rage::CPed* m_ped; //0x01C8
+	uint32_t m_external_ip; //0x0044
+	uint16_t m_external_port; //0x0048
+	char pad_004A[38]; //0x004A
+	uint64_t m_rockstar_id; //0x0070
+	char pad_0078[12]; //0x0078
+	char m_name[20]; //0x0084
+	char pad_0098[180]; //0x0098
+	float m_swim_speed; //0x014C
+	float m_run_speed; //0x0150
+	char pad_0154[81]; //0x0154
+	bool m_is_rockstar_dev; //0x01A5
+	char pad_01A6[1]; //0x01A6
+	bool m_is_cheater; //0x01A7
+	char pad_01A8[11]; //0x01A8
+	bool m_is_online; //0x01B3
+	char pad_01B4[20]; //0x01B4
+	class CPed* m_ped; //0x01C8
 	char pad_01D0[40]; //0x01D0
-	std::uint32_t m_frame_flags; //0x01F8
+	uint32_t m_frame_flags; //0x01F8
 	char pad_01FC[28]; //0x01FC
-	std::uint32_t m_player_controls; //0x0218
-	char pad_021C[1524]; //0x021C
-	bool m_is_wanted; //0x0810
-	char pad_0811[51]; //0x0811
-	std::int32_t m_wanted_level_display; //0x0844
-	std::int32_t m_wanted_level; //0x0848
-}; //Size: 0x084C
+	uint32_t m_player_controls; //0x0218
+	char pad_021C[1604]; //0x021C
+	bool m_is_wanted; //0x0860
+	char pad_0861[3]; //0x0861
+	int8_t m_wanted_level_display; //0x0864
+	char pad_0865[3]; //0x0865
+	int8_t m_wanted_level; //0x0868
+}; //Size: 0x0869
+static_assert(sizeof(CPlayerInfo) == 0x869);
 
 static_assert(sizeof(CNonPhysicalPlayerData) == 0x1C);
 #pragma pack(pop)
diff --git a/BigBaseV2/src/gta/replay.hpp b/BigBaseV2/src/gta/replay.hpp
index 5ef8fd04..bab2fc6f 100644
--- a/BigBaseV2/src/gta/replay.hpp
+++ b/BigBaseV2/src/gta/replay.hpp
@@ -53,10 +53,10 @@ namespace rage
 	public:
 		char pad_018C[2972]; //0x018C
 		class CVehicle* m_last_vehicle; //0x0D28
-		char pad_0D30[892]; //0x0D30
-		int8_t m_decal_index; //0x10AC
-		int8_t m_decal_info; //0x10AD
-		char pad_10AE[26]; //0x10AE
+		char pad_0D30[908]; //0x0D30
+		int8_t m_decal_index; //0x10BC
+		int8_t m_decal_info; //0x10BD
+		char pad_10BE[10]; //0x10BE
 		class CPlayerInfo* m_player_info; //0x10C8
 	};