diff options
author | aap <aap@papnet.eu> | 2020-06-01 10:44:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-01 10:44:33 +0200 |
commit | 6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0 (patch) | |
tree | 5f09d5f4358b1518262068d65ac713993b2cf437 /src/core/Fire.cpp | |
parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
parent | fix (diff) | |
download | re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar.gz re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar.bz2 re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar.lz re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar.xz re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.tar.zst re3-6d3e54369ce9ac826ab7c74da4be1c15d3ff3df0.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); |