diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
| commit | 9960c411933f9a804eb5f6840d75ad00fd255252 (patch) | |
| tree | 19886c3263958d5c77664518270d252ad5554602 /src/vehicles/Vehicle.h | |
| parent | Merge pull request #512 from Nick007J/master (diff) | |
| download | re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.gz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.bz2 re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.lz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.xz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.zst re3-9960c411933f9a804eb5f6840d75ad00fd255252.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.h')
| -rw-r--r-- | src/vehicles/Vehicle.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index bff5d578..110ff97c 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -109,18 +109,6 @@ 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); @@ -184,10 +172,6 @@ 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; @@ -252,9 +236,6 @@ 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; } @@ -310,4 +291,9 @@ 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); |