diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 07:49:58 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 07:49:58 +0200 |
| commit | c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9 (patch) | |
| tree | 4e070d777e5fa2d947ba94ba6b2cba8f1afc92d3 /src/audio/MusicManager.cpp | |
| parent | Audio: fix PS2 ifdefs (diff) | |
| download | re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.gz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.bz2 re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.lz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.xz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.zst re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/MusicManager.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 59cec9b3..c97b9c24 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -263,7 +263,7 @@ cMusicManager::GetRadioInCar(void) CVehicle* veh = AudioManager.FindVehicleOfPlayer(); if (veh != nil) { if (UsesPoliceRadio(veh) || UsesTaxiRadio(veh)) { - if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && !AudioManager.m_nUserPause)) + if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && !AudioManager.m_bIsPaused)) return STREAMED_SOUND_RADIO_POLICE; return m_nRadioInCar; } @@ -271,7 +271,7 @@ cMusicManager::GetRadioInCar(void) } } - if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && !AudioManager.m_nUserPause)) + if (m_nRadioInCar == NO_TRACK || (CReplay::IsPlayingBack() && !AudioManager.m_bIsPaused)) return RADIO_OFF; return m_nRadioInCar; } @@ -353,7 +353,7 @@ cMusicManager::ChangeMusicMode(uint8 mode) } void -cMusicManager::ResetTimers(int32 time) +cMusicManager::ResetTimers(uint32 time) { m_bResetTimers = TRUE; m_nResetTime = time; @@ -374,7 +374,7 @@ cMusicManager::Service() if (!m_bMusicModeChangeStarted) m_nMusicModeToBeSet = m_nUpcomingMusicMode; if (m_nMusicModeToBeSet == m_nMusicMode) { - if (!AudioManager.m_nUserPause || AudioManager.m_nPreviousUserPause || m_nMusicMode != MUSICMODE_FRONTEND) + if (!AudioManager.m_bIsPaused || AudioManager.m_bWasPaused || m_nMusicMode != MUSICMODE_FRONTEND) { switch (m_nMusicMode) { @@ -387,7 +387,7 @@ cMusicManager::Service() m_nMusicMode = MUSICMODE_DISABLED; } else { m_bMusicModeChangeStarted = TRUE; - if (!m_bUserResumedGame && !AudioManager.m_nUserPause && AudioManager.m_nPreviousUserPause) + if (!m_bUserResumedGame && !AudioManager.m_bIsPaused && AudioManager.m_bWasPaused) m_bUserResumedGame = TRUE; if (AudioManager.m_FrameCounter % 4 == 0) { gNumRetunePresses = 0; @@ -461,7 +461,7 @@ cMusicManager::ServiceFrontEndMode() } else { if (m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER) SampleManager.StartStreamedFile(STREAMED_SOUND_RADIO_MP3_PLAYER, 0); - else if (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED && !AudioManager.m_nUserPause) + else if (m_nPlayingTrack == STREAMED_SOUND_MISSION_COMPLETED && !AudioManager.m_bIsPaused) ChangeMusicMode(MUSICMODE_GAME); } } else { |