From 4846564c78076eefdc4066accc204082dea2ffc7 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 25 Dec 2020 11:11:37 +0200 Subject: cMusicManager::ServiceGameMode fix --- src/audio/MusicManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio/MusicManager.cpp') diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 8aedf306..bbbf3549 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -512,7 +512,7 @@ cMusicManager::ServiceGameMode() gRetuneCounter = 0; field_2 = false; } else if (ped) { - if (ped->m_objective != OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN && ped->m_objective != OBJ_55) { + if(!ped->DyingOrDead()) { #ifdef GTA_PC if (SampleManager.IsMP3RadioChannelAvailable() && vehicle->m_nRadioStation < USERTRACK -- cgit v1.2.3 From c0be4a3f7da39baefc6c0cd0d0d22be8c685b558 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Fri, 25 Dec 2020 12:06:08 +0200 Subject: Fix cMusicManager::SetRadioChannelByScript --- src/audio/MusicManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/audio/MusicManager.cpp') diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index bbbf3549..c4abf351 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -223,8 +223,8 @@ void cMusicManager::SetRadioChannelByScript(uint32 station, int32 pos) { if (m_bIsInitialised) { - if (station == USERTRACK) - station = RADIO_OFF; + if (station == STREAMED_SOUND_RADIO_MP3_PLAYER) + station = STREAMED_SOUND_CITY_AMBIENT; if (station <= STREAMED_SOUND_RADIO_POLICE) { m_bRadioSetByScript = true; m_nRadioStation = station; @@ -564,8 +564,8 @@ cMusicManager::ServiceGameMode() gRetuneCounter = 0; return; } - if (m_nAnnouncement == NO_TRACK) - { + if(m_nAnnouncement == NO_TRACK) { + m_nStreamedTrack = NO_TRACK; m_nFrontendTrack = GetCarTuning(); field_2 = false; gRetuneCounter = 0; -- cgit v1.2.3