summaryrefslogtreecommitdiffstats
path: root/src/audio/MusicManager.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-12-19 18:39:42 +0100
committerGitHub <noreply@github.com>2020-12-19 18:39:42 +0100
commit4c46d2498315475aafd517db81ef8beeb6e0c322 (patch)
tree7cfc90f08d5accafe3611c15e086bdefbe28b221 /src/audio/MusicManager.cpp
parentradio scroll fix (diff)
downloadre3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar.gz
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar.bz2
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar.lz
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar.xz
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.tar.zst
re3-4c46d2498315475aafd517db81ef8beeb6e0c322.zip
Diffstat (limited to 'src/audio/MusicManager.cpp')
-rw-r--r--src/audio/MusicManager.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 26f6d15c..cde1c8f5 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -90,12 +90,9 @@ cMusicManager::DisplayRadioStationName()
if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT ||
gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) {
gStreamedSound = POLICE_RADIO; // which means OFF
- } else {
-
- if(gStreamedSound >
- STREAMED_SOUND_RADIO_MP3_PLAYER)
- return;
- }
+
+ } else if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER)
+ return;
gRetuneCounter = gNumRetunePresses;
pRetune = gStreamedSound;
@@ -118,12 +115,8 @@ cMusicManager::DisplayRadioStationName()
if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT ||
gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) {
gStreamedSound = POLICE_RADIO; // which means OFF
- } else {
-
- if(gStreamedSound >
- STREAMED_SOUND_RADIO_MP3_PLAYER)
- return;
- }
+ } else if(gStreamedSound > STREAMED_SOUND_RADIO_MP3_PLAYER)
+ return;
pRetune = gNumRetunePresses + gStreamedSound;