diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-10-25 18:39:26 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-10-26 13:05:00 +0200 |
| commit | 8808e6fdfe5604022a64e72df3ee60d8ed10e9d6 (patch) | |
| tree | 02a3e0e3dca2f3d52cb45017ad50d627ffec9841 /src/audio/MusicManager.cpp | |
| parent | Audio fixes from Serg (diff) | |
| download | re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.gz re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.bz2 re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.lz re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.xz re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.tar.zst re3-8808e6fdfe5604022a64e72df3ee60d8ed10e9d6.zip | |
Diffstat (limited to 'src/audio/MusicManager.cpp')
| -rw-r--r-- | src/audio/MusicManager.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index fa1a9390..de4d0489 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -64,11 +64,14 @@ cMusicManager::DisplayRadioStationName() if(SampleManager.IsMP3RadioChannelAvailable()) { gStreamedSound = MusicManager.m_nCurrentStreamedSound; - if(gStreamedSound != STREAMED_SOUND_CITY_AMBIENT && - gStreamedSound != STREAMED_SOUND_WATER_AMBIENT) { - if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER) return; - } else { + if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT || + gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) { gStreamedSound = STREAMED_SOUND_RADIO_POLICE; + } else { + + if(gStreamedSound > + STREAMED_SOUND_RADIO_MP3_PLAYER) + return; } pRetune = gNumRetunePresses + gStreamedSound; @@ -242,4 +245,4 @@ void cMusicManager::Service() { EAXJMP(0x57D440); -}
\ No newline at end of file +} |