summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-12-15 16:37:21 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-12-15 16:37:21 +0100
commitb834d9258535b2cb89bd7bde3db111a74c59e746 (patch)
tree7ef87fdce250a0e064d1e27ea2090e8c0a74f746
parentMerge branch 'master' of https://github.com/GTAmodding/re3 (diff)
downloadre3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar.gz
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar.bz2
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar.lz
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar.xz
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.tar.zst
re3-b834d9258535b2cb89bd7bde3db111a74c59e746.zip
Diffstat (limited to '')
-rw-r--r--src/audio/MusicManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 5f94093e..26f6d15c 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -89,7 +89,7 @@ cMusicManager::DisplayRadioStationName()
if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT ||
gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) {
- gStreamedSound = RADIO_OFF;
+ gStreamedSound = POLICE_RADIO; // which means OFF
} else {
if(gStreamedSound >
@@ -117,7 +117,7 @@ cMusicManager::DisplayRadioStationName()
if(gStreamedSound == STREAMED_SOUND_CITY_AMBIENT ||
gStreamedSound == STREAMED_SOUND_WATER_AMBIENT) {
- gStreamedSound = RADIO_OFF;
+ gStreamedSound = POLICE_RADIO; // which means OFF
} else {
if(gStreamedSound >
@@ -170,13 +170,13 @@ cMusicManager::DisplayRadioStationName()
case CHATTERBOX: string = TheText.Get("FEA_FM8"); break;
case USERTRACK: string = TheText.Get("FEA_FM9"); break;
#ifdef RADIO_OFF_TEXT
- case RADIO_OFF: string = TheText.Get("FEM_OFF"); break;
+ case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEM_OFF"); break;
#endif
default: return;
};
#ifdef RADIO_OFF_TEXT
- if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
+ if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEM_OFF"); }
#else
if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; }
#endif