diff --git a/classes.cpp b/classes.cpp index 8add3f8..7c3a655 100644 --- a/classes.cpp +++ b/classes.cpp @@ -205,6 +205,7 @@ #include "vehicle/CVehicleDriveByMetadataMgr.hpp" #include "vehicle/CVehicleSeatMetadataMgr.hpp" #include "vehicle/CTrainConfig.hpp" +#include "vehicle/CGetPedSeatReturnClass.hpp" #include "weapon/CAmmoInfo.hpp" #include "weapon/CAmmoProjectileInfo.hpp" #include "weapon/CAmmoRocketInfo.hpp" diff --git a/gtav.rcnet b/gtav.rcnet index 7d24e27..8239f87 100644 Binary files a/gtav.rcnet and b/gtav.rcnet differ diff --git a/ped/CPed.hpp b/ped/CPed.hpp index 71aa698..a24b2d1 100644 --- a/ped/CPed.hpp +++ b/ped/CPed.hpp @@ -44,7 +44,9 @@ public: float m_injured_health_threshold; //0x1518 float m_dying_health_threshold; //0x151C float m_hurt_health_threshold; //0x1520 - char pad_1524[240]; //0x1524 + char pad_1524[12]; //0x1524 + 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 diff --git a/rage/atArray.hpp b/rage/atArray.hpp index 91fc550..2b3b175 100644 --- a/rage/atArray.hpp +++ b/rage/atArray.hpp @@ -198,7 +198,7 @@ namespace rage bool contains(T comparator) { - for (auto iter_value : this) + for (auto iter_value : *this) { if (iter_value == comparator) { diff --git a/vehicle/CDriveByAnimInfo.hpp b/vehicle/CDriveByAnimInfo.hpp new file mode 100644 index 0000000..28fca61 --- /dev/null +++ b/vehicle/CDriveByAnimInfo.hpp @@ -0,0 +1,9 @@ +#include "CWeaponGroupNames.hpp" + +class CDriveByAnimInfo +{ +public: + char pad_0000[48]; //0x0000 + class CWeaponGroupNames* m_weapon_groups; //0x0030 +}; //Size: 0x0088 +static_assert(sizeof(CDriveByAnimInfo) == 0x38); \ No newline at end of file diff --git a/vehicle/CGetPedSeatReturnClass.hpp b/vehicle/CGetPedSeatReturnClass.hpp new file mode 100644 index 0000000..a3f4b09 --- /dev/null +++ b/vehicle/CGetPedSeatReturnClass.hpp @@ -0,0 +1,9 @@ + +#pragma pack(push, 1) +class CGetPedSeatReturnClass +{ +public: + char padding[8]; + CVehicleDriveByAnimInfo* anim_info; +}; +#pragma pack(pop) \ No newline at end of file diff --git a/vehicle/CVehicleDriveByAnimInfo.hpp b/vehicle/CVehicleDriveByAnimInfo.hpp index 65a397c..9c29dfa 100644 --- a/vehicle/CVehicleDriveByAnimInfo.hpp +++ b/vehicle/CVehicleDriveByAnimInfo.hpp @@ -1,4 +1,5 @@ #include "../rage/atArray.hpp" +#include "CDriveByAnimInfo.hpp" #pragma once @@ -31,6 +32,6 @@ public: float m_spine_additive_blend_out_duration; //0x005C float m_min_unarmed_driveby_yaw_if_window_rolled_up; //0x0060 float m_max_unarmed_driveby_yaw_if_window_rolled_up; //0x0064 - rage::atArray m_drive_by_anim_infos; //0x0068 + rage::atArray m_drive_by_anim_infos; //0x0068 }; //Size: 0x0078 #pragma pack(pop) \ No newline at end of file diff --git a/vehicle/CWeaponGroupNames.hpp b/vehicle/CWeaponGroupNames.hpp new file mode 100644 index 0000000..95bf197 --- /dev/null +++ b/vehicle/CWeaponGroupNames.hpp @@ -0,0 +1,13 @@ +#include "../rage/atArray.hpp" + +#pragma pack(push, 1) +class CWeaponGroupNames +{ +public: + char pad_0000[8]; //0x0000 + rage::atArray m_groups; //0x0008 + char pad_0018[4]; //0x0018 + rage::atArray m_weapons; //0x001C +}; //Size: 0x002C +#pragma pack(pop) +static_assert(sizeof(CWeaponGroupNames) == 0x2C); \ No newline at end of file