diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-28 18:55:15 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-28 18:55:15 +0100 |
| commit | 101c21e06472e81bfd7f2b11e02c7fb7503dbd5a (patch) | |
| tree | 4cd8c69f467a9e11f9360dca58888f8752addafa /src/audio/AudioManager.cpp | |
| parent | garage update part 2 (diff) | |
| parent | Merge pull request #363 from erorcun/erorcun (diff) | |
| download | re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar.gz re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar.bz2 re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar.lz re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar.xz re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.tar.zst re3-101c21e06472e81bfd7f2b11e02c7fb7503dbd5a.zip | |
Diffstat (limited to 'src/audio/AudioManager.cpp')
| -rw-r--r-- | src/audio/AudioManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 2565a269..e2ca6143 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -20,6 +20,7 @@ #include "MusicManager.h" #include "Pad.h" #include "Ped.h" +#include "Fire.h" #include "Physical.h" #include "Placeable.h" #include "Plane.h" @@ -7533,8 +7534,8 @@ cAudioManager::ProcessVehicleSkidding(cVehicleParams *params) void cAudioManager::ProcessWaterCannon(int32) { for(int32 i = 0; i < NUM_WATERCANNONS; i++) { - if(aCannons[i].m_nId) { - m_sQueueSample.m_vecPos = aCannons[0].m_avecPos[aCannons[i].m_wIndex]; + if(CWaterCannons::aCannons[i].m_nId) { + m_sQueueSample.m_vecPos = CWaterCannons::aCannons[0].m_avecPos[CWaterCannons::aCannons[i].m_nCur]; float distSquared = GetDistanceSquared(&m_sQueueSample.m_vecPos); if(distSquared < 900.f) { m_sQueueSample.m_fDistance = Sqrt(distSquared); |