diff options
| author | aap <aap@papnet.eu> | 2019-07-26 01:34:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 01:34:40 +0200 |
| commit | 01bbb0530b3ede5d45eb730696b64f87eb1c1045 (patch) | |
| tree | f86d3d0e5b4ec32026775eb9ede17e894d6ca40e /src/vehicles/Vehicle.cpp | |
| parent | Merge pull request #162 from erorcun/erorcun (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.gz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.bz2 re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.lz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.xz re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.tar.zst re3-01bbb0530b3ede5d45eb730696b64f87eb1c1045.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index cc98bbe9..4bcd08db 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -377,12 +377,13 @@ CVehicle::ProcessDelayedExplosion(void) return; int tick = CTimer::GetTimeStep()/60.0f*1000.0f; + int16 prev = m_nBombTimer; if(tick > m_nBombTimer) m_nBombTimer = 0; else m_nBombTimer -= tick; - if(IsCar() && ((CAutomobile*)this)->m_bombType == CARBOMB_TIMEDACTIVE && (m_nBombTimer & 0xFE00) != 0xFE00) + if(IsCar() && ((CAutomobile*)this)->m_bombType == CARBOMB_TIMEDACTIVE && (m_nBombTimer & 0xFE00) != (prev & 0xFE00)) DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_BOMB_TICK, 0.0f); if (m_nBombTimer != 0) |