diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-12-25 11:06:08 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-12-25 11:06:08 +0100 |
| commit | c0be4a3f7da39baefc6c0cd0d0d22be8c685b558 (patch) | |
| tree | c599e7117412ba3296459885294c6cecefb789be /src/audio/MusicManager.cpp | |
| parent | Merge pull request #894 from erorcun/miami (diff) | |
| download | re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar.gz re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar.bz2 re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar.lz re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar.xz re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.tar.zst re3-c0be4a3f7da39baefc6c0cd0d0d22be8c685b558.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |