diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-24 15:44:59 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-24 15:44:59 +0100 |
| commit | 8cc3f867a6446c2275d985599b639bb9c665f16b (patch) | |
| tree | 2223385fe81b4347f5a07af17667144318193334 | |
| parent | Merge pull request #893 from Nick007J/master (diff) | |
| download | re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar.gz re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar.bz2 re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar.lz re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar.xz re3-8cc3f867a6446c2275d985599b639bb9c665f16b.tar.zst re3-8cc3f867a6446c2275d985599b639bb9c665f16b.zip | |
| -rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index ec56861e..b5ab2f21 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -4246,7 +4246,9 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg) veh->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType); if (veh->pDriver == ped) { veh->RemoveDriver(); +#ifndef FIX_BUGS // RemoveDriver does it anyway veh->SetStatus(STATUS_ABANDONED); +#endif if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY) veh->m_nDoorLock = CARLOCK_UNLOCKED; if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle()) diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 9adcf148..ba9348f0 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -1171,7 +1171,10 @@ CVehicle::AddPassenger(CPed *passenger, uint8 n) void CVehicle::RemoveDriver(void) { - SetStatus(STATUS_ABANDONED); +#ifdef FIX_BUGS + if (GetStatus() != STATUS_WRECKED) +#endif + SetStatus(STATUS_ABANDONED); pDriver = nil; } |