From 4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sun, 31 Jan 2021 23:44:30 +0200 Subject: [PATCH] Add radio off text --- gamefiles/TEXT/american.gxt | Bin 220146 -> 220176 bytes src/audio/MusicManager.cpp | 4 ++-- utils/gxt/american.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gamefiles/TEXT/american.gxt b/gamefiles/TEXT/american.gxt index cf4bb1e537a7ed4f0ca43b2455bfbe51dde8435f..756fafa301e5a9e12e6e0d9ed307629a277800bf 100644 GIT binary patch delta 7058 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 delta 7077 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 diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 54c1b0bc..ad304985 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -163,13 +163,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: case POLICE_RADIO: string = TheText.Get("FEM_OFF"); break; + case RADIO_OFF: case POLICE_RADIO: string = TheText.Get("FEA_FMN"); break; #endif default: return; }; #ifdef RADIO_OFF_TEXT - if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEM_OFF"); } + if(pRetune == USERTRACK && !SampleManager.IsMP3RadioChannelAvailable()) { string = TheText.Get("FEA_FMN"); } #else if(pRetune > CHATTERBOX && !SampleManager.IsMP3RadioChannelAvailable()) { return; } #endif diff --git a/utils/gxt/american.txt b/utils/gxt/american.txt index 95e9d280..3b010736 100644 --- a/utils/gxt/american.txt +++ b/utils/gxt/american.txt @@ -8070,6 +8070,9 @@ INVERT PAD VERTICALLY [FEM_TWP] Toggle Waypoint +[FEA_FMN] +RADIO OFF + { end of file } [DUMMY]