a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 02:10:00 +00:00
Code Issues Projects Releases Wiki Activity

fixed double explosion

Browse source
This commit is contained in:
Nikolay Korolev 2020-12-24 17:44:59 +03:00
parent c995bdcdaf
commit 8cc3f867a6
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/peds/Ped.cpp
View file

@ -4246,7 +4246,9 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
veh->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType); veh->m_nGettingOutFlags &= ~GetCarDoorFlag(ped->m_vehEnterType);
if (veh->pDriver == ped) { if (veh->pDriver == ped) {
veh->RemoveDriver(); veh->RemoveDriver();
#ifndef FIX_BUGS // RemoveDriver does it anyway
veh->SetStatus(STATUS_ABANDONED); veh->SetStatus(STATUS_ABANDONED);
#endif
if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY) if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY)
veh->m_nDoorLock = CARLOCK_UNLOCKED; veh->m_nDoorLock = CARLOCK_UNLOCKED;
if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle()) if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle())

5
src/vehicles/Vehicle.cpp
View file

@ -1171,7 +1171,10 @@ CVehicle::AddPassenger(CPed *passenger, uint8 n)
void void
CVehicle::RemoveDriver(void) CVehicle::RemoveDriver(void)
{ {
SetStatus(STATUS_ABANDONED); #ifdef FIX_BUGS
if (GetStatus() != STATUS_WRECKED)
#endif
SetStatus(STATUS_ABANDONED);
pDriver = nil; pDriver = nil;
} }