diff options
author | eray orçunus <erayorcunus@gmail.com> | 2019-06-30 16:55:16 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2019-06-30 16:55:16 +0200 |
commit | e650c06acd17d6440fbc31bd9dc150d6dd17c45b (patch) | |
tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/entities/Vehicle.h | |
parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
parent | Merge pull request #79 from Nick007J/master (diff) | |
download | re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.gz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.bz2 re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.lz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.xz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.zst re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/entities/Vehicle.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h index f11e9e97..997720f6 100644 --- a/src/entities/Vehicle.h +++ b/src/entities/Vehicle.h @@ -50,8 +50,8 @@ public: float m_fBreakPedal; uint8 m_nCreatedBy; // eVehicleCreatedBy uint8 bIsLawEnforcer : 1; - uint8 m_veh_flagA2 : 1; - uint8 m_veh_flagA4 : 1; + uint8 bIsAmbulanceOnDuty : 1; + uint8 bIsFiretruckOnDuty : 1; uint8 m_veh_flagA8 : 1; uint8 m_veh_flagA10 : 1; uint8 m_veh_flagA20 : 1; @@ -111,7 +111,13 @@ public: eVehicleType m_vehType; static void *operator new(size_t); + static void *operator new(size_t sz, int slot); static void operator delete(void*, size_t); + static void operator delete(void*, int); + + ~CVehicle(void); + + void dtor(void) { this->CVehicle::~CVehicle(); } bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; } bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; } @@ -120,6 +126,7 @@ public: bool IsPlane(void) { return m_vehType == VEHICLE_TYPE_PLANE; } bool IsLawEnforcementVehicle(void); void ChangeLawEnforcerState(bool enable); + void RemovePassenger(CPed *); void RemoveDriver(void); bool IsUpsideDown(void); |