diff options
| author | aap <aap@papnet.eu> | 2019-08-02 23:09:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 23:09:37 +0200 |
| commit | a890a8a3b45c74c1e29bb4c9aba650752c39c5d9 (patch) | |
| tree | d41bb0d3b3f434ff8d4d3e4f12746451ae03083b /src/audio/MusicManager.cpp | |
| parent | some CPed cleanup (diff) | |
| parent | Merge branch 'master' of github.com:Fire-Head/re3 (diff) | |
| download | re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.gz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.bz2 re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.lz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.xz re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.tar.zst re3-a890a8a3b45c74c1e29bb4c9aba650752c39c5d9.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 71cc594b..0700ee63 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -8,7 +8,7 @@ #include "Camera.h" #include "World.h" #include "ModelIndices.h" -#include "SampleManager.h" +#include "sampman.h" #include "Replay.h" cMusicManager &MusicManager = *(cMusicManager*)0x8F3964; @@ -57,7 +57,7 @@ void cMusicManager::DisplayRadioStationName() if (MusicManager.m_bPlayerInCar && !MusicManager.m_bPreviousPlayerInCar) pCurrentStation = nil; - if (cSampleManager.IsMP3RadioChannelAvailable()) { + if (SampleManager.IsMP3RadioChannelAvailable()) { gStreamedSound = MusicManager.m_nCurrentStreamedSound; if (gStreamedSound != STREAMED_SOUND_CITY_AMBIENT && gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) { @@ -140,7 +140,7 @@ void cMusicManager::DisplayRadioStationName() return; }; - if (pRetune > CHATTERBOX && !CSampleManager::IsMP3RadioChannelAvailable()) { + if (pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; } |