diff --git a/ped/CPed.hpp b/ped/CPed.hpp index a24b2d1..9df6ace 100644 --- a/ped/CPed.hpp +++ b/ped/CPed.hpp @@ -22,14 +22,14 @@ public: char pad_030C[260]; //0x030C class CPedBoneInfo m_bone_info[9]; //0x0410 char pad_04A0[2160]; //0x04A0 - class CVehicle *m_vehicle; //0x0D10 + class CVehicle* m_vehicle; //0x0D10 char pad_0D18[896]; //0x0D18 uint32_t m_ped_type; //0x1098 char pad_109C[4]; //0x109C class CPedIntelligence* m_ped_intelligence; //0x10A0 - class CPlayerInfo *m_player_info; //0x10A8 + class CPlayerInfo* m_player_info; //0x10A8 class CPedInventory* m_inventory; //0x10B0 - class CPedWeaponManager *m_weapon_manager; //0x10B8 + class CPedWeaponManager* m_weapon_manager; //0x10B8 char pad_10C0[892]; //0x10C0 uint8_t m_seatbelt; //0x143C char pad_143D[13]; //0x143D @@ -48,11 +48,11 @@ public: void* m_seat_info; //0x1530 char pad_1538[220]; //0x1538 uint16_t m_cash; //0x1614 - char pad_1616[842]; //0x1616 - uint8_t fired_sticky_bombs; //0x1960 reverse from 1.66 2824 function E8 ? ? ? 48 8B F8 EB 5F add(1).rip(), function string: WM_MAX_STICKY - uint8_t fired_unk_0; //0x1961 - uint8_t fired_flares; //0x1962 - uint8_t fired_unk_1; //0x1963 + char pad_1616[846]; //0x1616 + uint8_t fired_sticky_bombs; //0x1964 reverse from 1.69 3258 function E8 ? ? ? ? 48 8B F8 EB ? 48 8B 47 add(1).rip(), function string: WM_MAX_STICKY + uint8_t fired_unk_0; //0x1965 + uint8_t fired_flares; //0x1966 + uint8_t fired_unk_1; //0x1967 float get_speed() { return sqrt(m_velocity.x * m_velocity.x + m_velocity.y * m_velocity.y + m_velocity.z * m_velocity.z); } @@ -70,6 +70,6 @@ public: bool has_seatbelt() { return m_seatbelt & 0x3; } void forced_aim(bool toggle) { m_forced_aim ^= (m_forced_aim ^ -(char)toggle) & 0x20; } -}; //Size: 0x1964 -static_assert(sizeof(CPed) == 0x1964); +}; //Size: 0x1968 +static_assert(sizeof(CPed) == 0x1968); #pragma pack(pop)