diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-09-30 02:44:02 +0300 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-09-30 02:44:02 +0300 |
| commit | f740588780897a2d9d0b29724d617b0eaa9b5025 (patch) | |
| tree | 2d9bb7a9ae9d10a2ebfceba7179b47c249b3e19a /src/weapons | |
| parent | f71953077d2412c4542e616cc9748217dfe046c7 (diff) | |
| parent | fae4c73ad3789de055b516c94dfaeda573c3050f (diff) | |
Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami
Diffstat (limited to 'src/weapons')
| -rw-r--r-- | src/weapons/Explosion.cpp | 14 | ||||
| -rw-r--r-- | src/weapons/Explosion.h | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp index 74af1375..5d4b8f80 100644 --- a/src/weapons/Explosion.cpp +++ b/src/weapons/Explosion.cpp @@ -31,6 +31,16 @@ void CExplosion::Initialise() { debug("Initialising CExplosion...\n"); + ClearAllExplosions(); + AudioHandle = DMAudio.CreateEntity(AUDIOTYPE_EXPLOSION, (void*)1); + if (AudioHandle >= 0) + DMAudio.SetEntityStatus(AudioHandle, true); + debug("CExplosion ready\n"); +} + +void +CExplosion::ClearAllExplosions() +{ for (int i = 0; i < ARRAY_SIZE(gaExplosion); i++) { gaExplosion[i].m_ExplosionType = EXPLOSION_GRENADE; gaExplosion[i].m_vecPosition = CVector(0.0f, 0.0f, 0.0f); @@ -44,10 +54,6 @@ CExplosion::Initialise() gaExplosion[i].m_fStartTime = 0.0f; gaExplosion[i].m_bIsBoat = false; } - AudioHandle = DMAudio.CreateEntity(AUDIOTYPE_EXPLOSION, (void*)1); - if (AudioHandle >= 0) - DMAudio.SetEntityStatus(AudioHandle, true); - debug("CExplosion ready\n"); } void diff --git a/src/weapons/Explosion.h b/src/weapons/Explosion.h index cfa75ec1..f709012e 100644 --- a/src/weapons/Explosion.h +++ b/src/weapons/Explosion.h @@ -37,6 +37,7 @@ class CExplosion float m_fZshift; public: static void Initialise(); + static void ClearAllExplosions(); static void Shutdown(); static int8 GetExplosionActiveCounter(uint8 id); static void ResetExplosionActiveCounter(uint8 id); |