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.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/entities/Vehicle.cpp') diff --git a/src/entities/Vehicle.cpp b/src/entities/Vehicle.cpp index bcbaee32..8c1ef515 100644 --- a/src/entities/Vehicle.cpp +++ b/src/entities/Vehicle.cpp @@ -16,6 +16,7 @@ bool &CVehicle::bCheat5 = *(bool *)0x95CD64; void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New(); } void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehiclePool()->New(handle); } void CVehicle::operator delete(void *p, size_t sz) { CPools::GetVehiclePool()->Delete((CVehicle*)p); } +void CVehicle::operator delete(void *p, int handle) { CPools::GetVehiclePool()->Delete((CVehicle*)p); } CVehicle::~CVehicle() { @@ -25,6 +26,8 @@ CVehicle::~CVehicle() m_audioEntityId = -5; } CRadar::ClearBlipForEntity(BLIP_CAR, CPools::GetVehiclePool()->GetIndex(this)); + if (pDriver) + pDriver->FlagToDestroyWhenNextProcessed(); for (int i = 0; i < m_nNumMaxPassengers; i++){ if (pPassengers[i]) pPassengers[i]->FlagToDestroyWhenNextProcessed(); -- cgit v1.2.3