diff options
| author | aap <aap@papnet.eu> | 2020-12-13 12:53:27 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-12-13 12:53:27 +0100 |
| commit | e3616c1ce166cffd357aa3e6d376317d5a32efc0 (patch) | |
| tree | 9967be1f599a952061dce972e3dd22a9eabfaeeb /src/core | |
| parent | 35cac6b93b5bdb859a47fe266686bb99163eba46 (diff) | |
| parent | 6d61f9d2e1185f169a1d5abb8f37b0f0a93869bc (diff) | |
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Fire.cpp | 6 |
1 files changed, 5 insertions, 1 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); |