diff options
| author | Nikolay <nickvnuk@gmail.com> | 2021-08-07 17:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 17:47:28 +0200 |
| commit | e947081622d337a5e22791691e5d0dbed56e0199 (patch) | |
| tree | 4cf5012d9795a870caf8ec00ef69b1f9baf15210 /src/weapons | |
| parent | CVehicle fixes and cleanup (diff) | |
| parent | more cherry-pick fix (diff) | |
| download | re3-e947081622d337a5e22791691e5d0dbed56e0199.tar re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.gz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.bz2 re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.lz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.xz re3-e947081622d337a5e22791691e5d0dbed56e0199.tar.zst re3-e947081622d337a5e22791691e5d0dbed56e0199.zip | |
Diffstat (limited to 'src/weapons')
| -rw-r--r-- | src/weapons/Explosion.cpp | 8 | ||||
| -rw-r--r-- | src/weapons/Explosion.h | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp index 078f01fa..7683ed97 100644 --- a/src/weapons/Explosion.cpp +++ b/src/weapons/Explosion.cpp @@ -102,7 +102,11 @@ CExplosion::GetExplosionPosition(uint8 id) } bool +#ifdef SIMPLER_MISSIONS +CExplosion::AddExplosion(CEntity* explodingEntity, CEntity* culprit, eExplosionType type, const CVector& pos, uint32 lifetime, bool makeSound, float radius) +#else CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool makeSound) +#endif { CVector pPosn; CVector posGround; @@ -150,7 +154,11 @@ CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionT switch (type) { case EXPLOSION_GRENADE: +#ifdef SIMPLER_MISSIONS + explosion.m_fRadius = (radius == -1.0f ? 9.0f : radius); +#else explosion.m_fRadius = 9.0f; +#endif explosion.m_fPower = 300.0f; explosion.m_fStopTime = lifetime + CTimer::GetTimeInMilliseconds() + 750; explosion.m_fPropagationRate = 0.5f; diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h index 7aa02b63..e76c99ea 100644 --- a/src/weapons/Explosion.h +++ b/src/weapons/Explosion.h @@ -37,7 +37,11 @@ class CExplosion float m_fPower; float m_fZshift; public: - static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool makeSound = true); //done(new parametr in android ver is fix for one mission) +#ifdef SIMPLER_MISSIONS + static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool makeSound = true, float radius = -1.0f); +#else + static bool AddExplosion(CEntity* explodingEntity, CEntity* culprit, eExplosionType type, const CVector& pos, uint32 lifetime, bool makeSound = true); +#endif static void ClearAllExplosions(); //done static bool DoesExplosionMakeSound(uint8 id); //done static int8 GetExplosionActiveCounter(uint8 id); //done |