diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-25 22:34:29 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-25 22:34:29 +0200 |
| commit | 5acce16261606f06e39e09d0bd6ec0d95787ae38 (patch) | |
| tree | d3b6a483930067302386dc3284dbd68326432bf3 /src/vehicles | |
| parent | fixed dinput (diff) | |
| download | re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.gz re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.bz2 re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.lz re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.xz re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.tar.zst re3-5acce16261606f06e39e09d0bd6ec0d95787ae38.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Boat.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index c18bad25..f614b78f 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -5,7 +5,7 @@ float &fShapeLength = *(float*)0x600E78; float &fShapeTime = *(float*)0x600E7C; float &fRangeMult = *(float*)0x600E80; //0.6f; // 0.75f gta 3 -float &fTimeMult = *(float*)0xA0FCF4; +float &fTimeMult = *(float*)0x943008; float MAX_WAKE_LENGTH = 50.0f; float MIN_WAKE_INTERVAL = 1.0f; 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) |