diff options
author | erorcun <erayorcunus@gmail.com> | 2020-10-08 15:15:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-08 15:15:18 +0200 |
commit | 3435d6656c5af26f39bcc3caee88b410b6e23dcd (patch) | |
tree | 8d549040785fb72d3e6e770ac84d0f884a7a2445 /src/weapons/Explosion.h | |
parent | Merge pull request #735 from theR4K/miami (diff) | |
parent | rename var (diff) | |
download | re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar.gz re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar.bz2 re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar.lz re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar.xz re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.tar.zst re3-3435d6656c5af26f39bcc3caee88b410b6e23dcd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/weapons/Explosion.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h index f709012e..7aa02b63 100644 --- a/src/weapons/Explosion.h +++ b/src/weapons/Explosion.h @@ -30,24 +30,25 @@ class CExplosion float m_fStopTime; uint8 m_nIteration; uint8 m_nActiveCounter; + bool m_bIsBoat; + bool m_bMakeSound; float m_fStartTime; uint32 m_nParticlesExpireTime; float m_fPower; - bool m_bIsBoat; float m_fZshift; public: - static void Initialise(); - static void ClearAllExplosions(); - static void Shutdown(); - static int8 GetExplosionActiveCounter(uint8 id); - static void ResetExplosionActiveCounter(uint8 id); - static uint8 GetExplosionType(uint8 id); - static CVector *GetExplosionPosition(uint8 id); -// TODO(MIAMI): that new parameter - static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool unk = true); - static void Update(); - static bool TestForExplosionInArea(eExplosionType type, float x1, float x2, float y1, float y2, float z1, float z2); - static void RemoveAllExplosionsInArea(CVector pos, float radius); + 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) + static void ClearAllExplosions(); //done + static bool DoesExplosionMakeSound(uint8 id); //done + static int8 GetExplosionActiveCounter(uint8 id); //done + static CVector *GetExplosionPosition(uint8 id); //done + static uint8 GetExplosionType(uint8 id); //done, mb need change type to tExplosionType + static void Initialise(); //done + static void RemoveAllExplosionsInArea(CVector pos, float radius); //done + static void ResetExplosionActiveCounter(uint8 id); //done + static void Shutdown(); //done + static void Update(); //done + static bool TestForExplosionInArea(eExplosionType type, float x1, float x2, float y1, float y2, float z1, float z2); //done, not used }; extern CExplosion gaExplosion[NUM_EXPLOSIONS];
\ No newline at end of file |