diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:43 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:43 +0200 |
commit | c2b9ddc5b8935dcd8de593c918f50886e0400319 (patch) | |
tree | 99f4d7dec983e7ad6f4071cc259c8c0de2eda2e2 /src/vehicles/Vehicle.h | |
parent | Remove Miami stuff (diff) | |
download | re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.gz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.bz2 re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.lz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.xz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.zst re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.zip |
Diffstat (limited to 'src/vehicles/Vehicle.h')
-rw-r--r-- | src/vehicles/Vehicle.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 110ff97c..bff5d578 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -109,6 +109,18 @@ enum eFlightModel FLIGHT_MODEL_SEAPLANE }; +#ifdef MIAMI +enum eVehicleAppearance +{ + VEHICLE_NONE, + VEHICLE_CAR, + VEHICLE_BIKE, + VEHICLE_HELI, + VEHICLE_BOAT, + VEHICLE_PLANE, +}; +#endif + // Or Weapon.h? void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage); @@ -172,6 +184,10 @@ public: uint8 bIsCarParkVehicle : 1; // Car has been created using the special CAR_PARK script command uint8 bHasAlreadyBeenRecorded : 1; // Used for replays +#ifdef MIAMI + uint8 bParking : 1; +#endif; + int8 m_numPedsUseItAsCover; uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default) int8 m_nPacManPickupsCarried; @@ -236,6 +252,9 @@ public: virtual void Load(uint8*& buf); #endif +#ifdef MIAMI + eVehicleAppearance GetVehicleAppearance(void); +#endif bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; } bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; } bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; } @@ -291,9 +310,4 @@ public: static bool m_bDisableMouseSteering; }; -static_assert(sizeof(CVehicle) == 0x288, "CVehicle: error"); -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"); - void DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle); |