diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-12 21:17:16 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-12 21:17:16 +0100 |
| commit | 6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc (patch) | |
| tree | d8024bfb97f314c4354440c78e225518ec08ee13 | |
| parent | better fix (diff) | |
| download | re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar.gz re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar.bz2 re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar.lz re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar.xz re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.tar.zst re3-6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/Fire.cpp | 6 | ||||
| -rw-r--r-- | src/peds/PedAI.cpp | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp index a47ca3cf..e73ffea1 100644 --- a/src/core/Fire.cpp +++ b/src/core/Fire.cpp @@ -107,7 +107,11 @@ CFire::ProcessFire(void) } } } - if (!FindPlayerVehicle() && !FindPlayerPed()->m_pFire && !(FindPlayerPed()->bFireProof) + if (!FindPlayerVehicle() && +#ifdef FIX_BUGS + FindPlayerPed() && +#endif + !FindPlayerPed()->m_pFire && !(FindPlayerPed()->bFireProof) && ((FindPlayerPed()->GetPosition() - m_vecPos).MagnitudeSqr() < 2.0f)) { FindPlayerPed()->DoStuffToGoOnFire(); gFireManager.StartFire(FindPlayerPed(), m_pSource, 0.8f, 1); diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index 23119a59..ecd11098 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -3293,9 +3293,15 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg) } if (ped->bFleeAfterExitingCar || ped->bGonnaKillTheCarJacker) { - // POTENTIAL BUG? Why DOOR_FRONT_LEFT instead of door variable? or vice versa? +#ifdef FIX_BUGS + if (!veh->IsDoorMissing(door)) + ((CAutomobile*)veh)->Damage.SetDoorStatus(door, DOOR_STATUS_SWINGING); + PedSetOutCarCB(nil, ped); + return; +#else if (!veh->IsDoorMissing(door)) ((CAutomobile*)veh)->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_SWINGING); +#endif } else { switch (door) { case DOOR_FRONT_LEFT: |