diff options
author | aap <aap@papnet.eu> | 2020-06-01 18:05:24 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-06-01 18:05:24 +0200 |
commit | 25273485d93dcb85e84f184d5e3e6d35a0944164 (patch) | |
tree | 1ebede77df503742ec1b7e441d64281cbf494523 /src/core/Fire.cpp | |
parent | gravity (diff) | |
parent | Merge pull request #608 from Nick007J/miami (diff) | |
download | re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar.gz re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar.bz2 re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar.lz re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar.xz re3-25273485d93dcb85e84f184d5e3e6d35a0944164.tar.zst re3-25273485d93dcb85e84f184d5e3e6d35a0944164.zip |
Diffstat (limited to 'src/core/Fire.cpp')
-rw-r--r-- | src/core/Fire.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp index 933c73da..3752f1ba 100644 --- a/src/core/Fire.cpp +++ b/src/core/Fire.cpp @@ -15,6 +15,7 @@ #include "DamageManager.h" #include "Ped.h" #include "Fire.h" +#include "GameLogic.h" CFireManager gFireManager; @@ -59,6 +60,12 @@ CFire::ProcessFire(void) Extinguish(); return; } +#if defined GTAVC_JP_PATCH && !defined FIX_BUGS + if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) { + Extinguish(); + return; + } +#endif if (ped->m_nMoveState != PEDMOVE_RUN) m_vecPos.z -= 1.0f; if (ped->bInVehicle && ped->m_pMyVehicle) { @@ -84,6 +91,12 @@ CFire::ProcessFire(void) Extinguish(); return; } +#ifdef FIX_BUGS + if (m_pEntity == CGameLogic::pShortCutTaxi && CGameLogic::ShortCutState == CGameLogic::SHORTCUT_TRANSITION) { + Extinguish(); + return; + } +#endif if (!m_bIsScriptFire) { fDamageVehicle = 1.2f * CTimer::GetTimeStep(); veh->InflictDamage((CVehicle *)m_pSource, WEAPONTYPE_FLAMETHROWER, fDamageVehicle); |