From e2bd3573b4d44b8f80197d8de98fcfc91e2229b8 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 30 Jun 2019 13:59:55 +0300 Subject: PlayBackThisFrameInterpolation and all it required... --- src/entities/Vehicle.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/entities/Vehicle.h') diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h index f11e9e97..eed8f7a8 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,8 +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); + ~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; } bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; } @@ -120,6 +125,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); -- cgit v1.2.3 From 90bcb888e8cd3f6580984c0248e474650c350007 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 30 Jun 2019 16:20:11 +0300 Subject: Reactivated Store(Restore)StuffIn(From)Mem, fixed bugs --- src/entities/Vehicle.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/entities/Vehicle.h') diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h index eed8f7a8..997720f6 100644 --- a/src/entities/Vehicle.h +++ b/src/entities/Vehicle.h @@ -113,6 +113,7 @@ public: 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); -- cgit v1.2.3