From cb262c791e95a959f015e3231f61912024c88818 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 8 Apr 2020 22:29:02 +0300 Subject: Finished CExplosion --- src/weapons/Explosion.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'src/weapons/Explosion.h') diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h index e6ef9496..45e2d5bb 100644 --- a/src/weapons/Explosion.h +++ b/src/weapons/Explosion.h @@ -26,25 +26,24 @@ class CExplosion CEntity *m_pCreatorEntity; CEntity *m_pVictimEntity; float m_fStopTime; - bool m_bActive; - int8 m_bActiveCounter; - int32 m_nStartTime; + uint8 m_nIteration; + uint8 m_nActiveCounter; + float m_fStartTime; uint32 m_nParticlesExpireTime; float m_fPower; - int32 field_34; - int32 field_38; + bool m_bIsBoat; + float m_fZshift; public: static void Initialise(); static void Shutdown(); - static void AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, - const CVector &pos, uint32); - static int8 GetExplosionActiveCounter(uint8 id); - static CVector *GetExplosionPosition(uint8 id); - static uint8 GetExplosionType(uint8 id); static void ResetExplosionActiveCounter(uint8 id); - static void RemoveAllExplosionsInArea(CVector, float); - static bool TestForExplosionInArea(eExplosionType, float, float, float, float, float, float); + static uint8 GetExplosionType(uint8 id); + static CVector *GetExplosionPosition(uint8 id); + static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime); + 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); }; -extern CExplosion (&gaExplosion)[48]; \ No newline at end of file +extern CExplosion (&gaExplosion)[NUM_EXPLOSIONS]; \ No newline at end of file -- cgit v1.2.3