diff options
| author | aap <aap@papnet.eu> | 2020-04-28 13:41:03 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-28 13:41:03 +0200 |
| commit | dc435a4165417171bbdf2754b1b6cd5c8e43bb19 (patch) | |
| tree | 651606f4a9921c866e327c4cac324a23a34d02f7 /src/audio/MusicManager.cpp | |
| parent | silly librw bug (diff) | |
| parent | Changing prefixes for some audio fields (diff) | |
| download | re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.gz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.bz2 re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.lz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.xz re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.tar.zst re3-dc435a4165417171bbdf2754b1b6cd5c8e43bb19.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index efea6e45..9cab45b4 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -1,5 +1,6 @@ #include "common.h" #include <time.h> +#include "soundlist.h" #include "MusicManager.h" #include "AudioManager.h" #include "ControllerConfig.h" @@ -302,14 +303,14 @@ cMusicManager::GetRadioInCar(void) CVehicle *veh = FindPlayerVehicle(); if (veh != nil){ if (UsesPoliceRadio(veh)) { - if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_bUserPause) + if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_nUserPause) return POLICE_RADIO; return m_nRadioInCar; } else return veh->m_nRadioStation; } } - if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_bUserPause) + if (m_nRadioInCar == NO_STREAMED_SOUND || CReplay::IsPlayingBack() && AudioManager.m_nUserPause) return RADIO_OFF; return m_nRadioInCar; } @@ -402,7 +403,7 @@ cMusicManager::ServiceFrontEndMode() switch (m_nCurrentStreamedSound) { case STREAMED_SOUND_MISSION_COMPLETED: - if (!AudioManager.m_bUserPause) + if (!AudioManager.m_nUserPause) ChangeMusicMode(MUSICMODE_GAME); break; case STREAMED_SOUND_GAME_COMPLETED: @@ -458,7 +459,7 @@ cMusicManager::ServiceGameMode() nFramesSinceCutsceneEnded = -1; } - if (AudioManager.m_bPreviousUserPause) + if (AudioManager.m_nPreviousUserPause) m_bPreviousPlayerInCar = false; if (!m_bPlayerInCar) { if (m_bPreviousPlayerInCar) { |