From c94ccce6d666cbd18739e208c9882a65613f10f0 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 27 Apr 2020 20:06:54 +0300 Subject: Audio structs moved to their AudioManager.h --- src/audio/AudioManager.h | 25 ++++++++++++++++++++++--- src/peds/Ped.h | 9 --------- src/vehicles/Vehicle.h | 15 --------------- 3 files changed, 22 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 72d8ba41..9479d1cd 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -242,12 +242,31 @@ public: }; -class cVehicleParams; +class cTransmission; class CPlane; class CVehicle; class CPed; -class cPedParams; -class cTransmission; + +class cPedParams +{ +public: + bool m_bDistanceCalculated; + float m_fDistance; + CPed *m_pPed; +}; + +class cVehicleParams +{ +public: + bool m_bDistanceCalculated; + float m_fDistance; + CVehicle *m_pVehicle; + cTransmission *m_pTransmission; + int m_nIndex; + float m_fVelocityChange; +}; + +static_assert(sizeof(cVehicleParams) == 0x18, "cVehicleParams: error"); enum { /* diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 2de30df6..46c6c82d 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -888,15 +888,6 @@ public: #endif }; -class cPedParams -{ -public: - bool m_bDistanceCalculated; - char gap_1[3]; - float m_fDistance; - CPed *m_pPed; -}; - void FinishFuckUCB(CAnimBlendAssociation *assoc, void *arg); #ifndef PED_SKIN diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index f9ff1037..cb4ac2cf 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -291,19 +291,4 @@ static_assert(offsetof(CVehicle, m_pCurGroundEntity) == 0x1E0, "CVehicle: error" static_assert(offsetof(CVehicle, m_nAlarmState) == 0x1A0, "CVehicle: error"); static_assert(offsetof(CVehicle, m_nLastWeaponDamage) == 0x228, "CVehicle: error"); -class cTransmission; - -class cVehicleParams -{ -public: - bool m_bDistanceCalculated; - float m_fDistance; - CVehicle *m_pVehicle; - cTransmission *m_pTransmission; - int m_nIndex; - float m_fVelocityChange; -}; - -static_assert(sizeof(cVehicleParams) == 0x18, "cVehicleParams: error"); - void DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle); -- cgit v1.2.3