summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioManager.cpp5
-rw-r--r--src/audio/AudioScriptObject.cpp1
-rw-r--r--src/audio/DMAudio.h1
-rw-r--r--src/audio/MusicManager.cpp1
-rw-r--r--src/audio/PoliceRadio.h2
5 files changed, 7 insertions, 3 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);
diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp
index 796cd88b..b5093c52 100644
--- a/src/audio/AudioScriptObject.cpp
+++ b/src/audio/AudioScriptObject.cpp
@@ -2,6 +2,7 @@
#include "patcher.h"
#include "AudioScriptObject.h"
#include "Pools.h"
+#include "DMAudio.h"
WRAPPER void cAudioScriptObject::SaveAllAudioScriptObjects(uint8 *buf, uint32 *size) { EAXJMP(0x57c460); }
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 90fe96b5..d2cdf466 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,7 +1,6 @@
#pragma once
#include "audio_enums.h"
-#include "Wanted.h"
enum eSound : int16
{
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 1fac8a23..1f1c343a 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -8,6 +8,7 @@
#include "Hud.h"
#include "ModelIndices.h"
#include "Replay.h"
+#include "Pad.h"
#include "Text.h"
#include "Timer.h"
#include "World.h"
diff --git a/src/audio/PoliceRadio.h b/src/audio/PoliceRadio.h
index 152a5ee2..4c7030f1 100644
--- a/src/audio/PoliceRadio.h
+++ b/src/audio/PoliceRadio.h
@@ -1,5 +1,7 @@
#pragma once
+#include "Wanted.h"
+
struct cAMCrime {
int32 type;
CVector position;