diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-02-26 10:07:32 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-02-26 10:07:32 +0100 |
commit | f6910d35f702e7767e6b52d5e7b3edd80fe85f96 (patch) | |
tree | 3968c943b721813f6880765e11a8ae2ade07da23 /src/audio/MusicManager.cpp | |
parent | rename error strings to RELCS (diff) | |
parent | PoliceRadio -> PolRadio (original name) (diff) | |
download | re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.gz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.bz2 re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.lz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.xz re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.tar.zst re3-f6910d35f702e7767e6b52d5e7b3edd80fe85f96.zip |
Diffstat (limited to 'src/audio/MusicManager.cpp')
-rw-r--r-- | src/audio/MusicManager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 34eae77c..e15bde94 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -1265,7 +1265,8 @@ cMusicManager::DisplayRadioStationName() if (vehicle) { -#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK + // Prev scroll needs it to be signed, and m_nFrontendTrack can be NO_TRACK thus FIX_BUGS +#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS int track; #else uint8 track; @@ -1281,13 +1282,16 @@ cMusicManager::DisplayRadioStationName() #endif while (track >= NUM_RADIOS + 1) track -= NUM_RADIOS + 1; - // We already handle this condition while scrolling back, on key press. No need to change this. + // On scrolling back we handle this condition on key press. No need to change this. if (!DMAudio.IsMP3RadioChannelAvailable() && track == USERTRACK) gNumRetunePresses++; } else +#ifdef RADIO_OFF_TEXT + track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios +#else track = m_nFrontendTrack; - +#endif wchar* string = nil; switch (track) { case WILDSTYLE: string = TheText.Get("FEA_FM0"); break; |