a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show Radio Off on interiors that don't want radio

This commit is contained in:
erorcun 2021-02-17 15:58:52 +03:00
parent f603f4397d
commit 75d8dd2bf2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/MusicManager.cpp
View File

@ -1265,7 +1265,11 @@ cMusicManager::DisplayRadioStationName()
if (vehicle) if (vehicle)
{ {
int8 track; #if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK
int track;
#else
uint8 track;
#endif
gStreamedSound = vehicle->m_nRadioStation; gStreamedSound = vehicle->m_nRadioStation;
if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT) if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
gStreamedSound = RADIO_OFF; gStreamedSound = RADIO_OFF;
@ -1282,11 +1286,7 @@ cMusicManager::DisplayRadioStationName()
gNumRetunePresses++; gNumRetunePresses++;
} }
else else
#ifdef FIX_BUGS
track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios
#else
track = m_nFrontendTrack; track = m_nFrontendTrack;
#endif
wchar* string = nil; wchar* string = nil;
switch (track) { switch (track) {
@ -1304,7 +1304,10 @@ cMusicManager::DisplayRadioStationName()
return; return;
string = TheText.Get("FEA_MP3"); break; string = TheText.Get("FEA_MP3"); break;
#ifdef RADIO_OFF_TEXT #ifdef RADIO_OFF_TEXT
case RADIO_OFF: { case STREAMED_SOUND_RADIO_POLICE:
case STREAMED_SOUND_RADIO_TAXI:
return;
default: {
extern wchar WideErrorString[]; extern wchar WideErrorString[];
string = TheText.Get("FEA_NON"); string = TheText.Get("FEA_NON");
@ -1314,8 +1317,9 @@ cMusicManager::DisplayRadioStationName()
} }
break; break;
} }
#endif #else
default: return; default: return;
#endif
}; };
if (pCurrentStation != string) { if (pCurrentStation != string) {