summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-31 22:44:30 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-31 22:44:30 +0100
commit4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa (patch)
treec6ae450521672e0e893bc08ef1ea60edf456cfd6
parentRevert "First batch of fixes (CallAndMessage)" (diff)
downloadre3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar.gz
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar.bz2
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar.lz
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar.xz
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.tar.zst
re3-4afa7b86aefdb98eab039e76bdaf0c6f75c67cfa.zip
Diffstat (limited to '')
-rw-r--r--gamefiles/TEXT/american.gxtbin220146 -> 220176 bytes
-rw-r--r--src/audio/MusicManager.cpp4
-rw-r--r--utils/gxt/american.txt3
3 files changed, 5 insertions, 2 deletions
diff --git a/gamefiles/TEXT/american.gxt b/gamefiles/TEXT/american.gxt
index cf4bb1e5..756fafa3 100644
--- a/gamefiles/TEXT/american.gxt
+++ b/gamefiles/TEXT/american.gxt
Binary files differ
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]