diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-23 23:13:40 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-24 17:08:34 +0100 |
| commit | 29fb996b00bd5ab231fb6347d3dfe9d13ec7f652 (patch) | |
| tree | 72da2a9aae7f4e957cba15e4125d68ec1277a0c4 /src/audio | |
| parent | mission cleanup fix (diff) | |
| download | re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.gz re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.bz2 re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.lz re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.xz re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.tar.zst re3-29fb996b00bd5ab231fb6347d3dfe9d13ec7f652.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 6 | ||||
| -rw-r--r-- | src/audio/AudioManager.cpp | 2 | ||||
| -rw-r--r-- | src/audio/AudioManager.h | 2 | ||||
| -rw-r--r-- | src/audio/AudioSamples.h | 2 | ||||
| -rw-r--r-- | src/audio/PoliceRadio.cpp | 2 | ||||
| -rw-r--r-- | src/audio/sampman_miles.cpp | 3 | ||||
| -rw-r--r-- | src/audio/soundlist.h | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index c58daaaf..ce543f33 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "common.h" #include "AudioManager.h" #include "audio_enums.h" @@ -43,7 +43,7 @@ #include "Script.h" #include "Wanted.h" -const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples); +const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples); const int policeChannel = channels + 1; const int allChannels = channels + 2; @@ -8108,7 +8108,7 @@ cAudioManager::ProcessWaterCannon(int32) } //positon of arcade machines -CVector aVecExtraSoundPosition[] = { {-1042.546f, 88.794f, 11.324f}, {-1004.476f, 181.697f, 11.324f} }; +CVector aVecExtraSoundPosition[] = { CVector(-1042.546f, 88.794f, 11.324f), CVector(-1004.476f, 181.697f, 11.324f) }; void cAudioManager::ProcessExtraSounds() diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 721a7acc..2304b4c4 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -14,7 +14,7 @@ cAudioManager AudioManager; -const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples); +const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples); const int policeChannel = channels + 1; const int allChannels = channels + 2; diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 376a7f60..14eacda5 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "audio_enums.h" #include "AudioCollision.h" diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h index a68cf768..5c5d857d 100644 --- a/src/audio/AudioSamples.h +++ b/src/audio/AudioSamples.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "common.h" diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp index e174e587..227d27d0 100644 --- a/src/audio/PoliceRadio.cpp +++ b/src/audio/PoliceRadio.cpp @@ -15,7 +15,7 @@ #include "sampman.h" #include "Wanted.h" -const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples); +const int channels = ARRAY_SIZE(AudioManager.m_asActiveSamples); const int policeChannel = channels + 1; struct tPoliceRadioZone { diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 2d6a655e..36f230b4 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1,3 +1,5 @@ +#include "common.h" + #ifdef AUDIO_MSS #include <shlobj.h> #include <shlguid.h> @@ -8,7 +10,6 @@ #include "eax-util.h" #include "mss.h" -#include "common.h" #include "sampman.h" #include "AudioManager.h" #include "MusicManager.h" diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h index 98982f61..4d88590e 100644 --- a/src/audio/soundlist.h +++ b/src/audio/soundlist.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once enum eSound { |