diff options
| author | withmorten <morten.with@gmail.com> | 2021-02-18 02:32:49 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-02-18 02:38:12 +0100 |
| commit | 037c33215801fdf10019d8e61c7de9a532256f92 (patch) | |
| tree | 20e5e2c2e00012366b29e5bbd2dcd406e0769698 /src/audio/MusicManager.cpp | |
| parent | update librw; gl cleanup (diff) | |
| parent | update librw; gl cleanup (diff) | |
| download | re3-037c33215801fdf10019d8e61c7de9a532256f92.tar re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.gz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.bz2 re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.lz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.xz re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.zst re3-037c33215801fdf10019d8e61c7de9a532256f92.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index d10a4d0e..34eae77c 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -1265,7 +1265,11 @@ cMusicManager::DisplayRadioStationName() if (vehicle) { - int8 track; +#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK + int track; +#else + uint8 track; +#endif gStreamedSound = vehicle->m_nRadioStation; if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT) gStreamedSound = RADIO_OFF; @@ -1282,11 +1286,7 @@ cMusicManager::DisplayRadioStationName() gNumRetunePresses++; } else -#ifdef FIX_BUGS - 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) { |