1 files changed, 19 insertions, 33 deletions

diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index c97b9c24..623b6ad5 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -164,8 +164,8 @@ cMusicManager::SetStartingTrackPositions(bool8 isNewGameTimer)
 
 			if (i < STREAMED_SOUND_CITY_AMBIENT && isNewGameTimer)
 				m_aTracks[i].m_nPosition = NewGameRadioTimers[i];
-			else if (i < STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED)
-				m_aTracks[i].m_nPosition = (pos * AudioManager.m_anRandomTable[i % 5]) % m_aTracks[i].m_nLength;
+			//else if (i < STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED)
+			//	m_aTracks[i].m_nPosition = (pos * AudioManager.GetRandomNumber(i % 5)) % m_aTracks[i].m_nLength;
 			else
 				m_aTracks[i].m_nPosition = 0;
 			
@@ -315,7 +315,7 @@ cMusicManager::ChangeMusicMode(uint8 mode)
 
 #ifdef PAUSE_RADIO_IN_FRONTEND
 		// rewind those streams we weren't listening right now
-		for( uint32 i = STREAMED_SOUND_RADIO_WILD; i < STREAMED_SOUND_CUTSCENE_ASS_1; i++ ) {
+		for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ ) {
 			m_aTracks[i].m_nPosition = GetTrackStartPos(i);
 			m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 		}
@@ -427,7 +427,7 @@ cMusicManager::ServiceFrontEndMode()
 
 #ifdef PAUSE_RADIO_IN_FRONTEND
 	// pause radio
-	for (uint32 i = STREAMED_SOUND_RADIO_WILD; i < STREAMED_SOUND_CUTSCENE_ASS_1; i++)
+	for( uint32 i = STREAMED_SOUND_RADIO_HEAD; i < STREAMED_SOUND_CUTSCENE_BIKER; i++ )
 		m_aTracks[i].m_nLastPosCheckTimer = CTimer::GetTimeInMillisecondsPauseMode();
 #endif
 
@@ -595,7 +595,7 @@ cMusicManager::ServiceGameMode()
 		if (!m_bRadioStreamReady)
 		{
 			if(vehicle == nil) {
-				m_nFrontendTrack = STREAMED_SOUND_RADIO_WAVE; // huh?
+				m_nFrontendTrack = STREAMED_SOUND_RADIO_LCFR; // huh?
 				return;
 			}
 			if(m_bRadioSetByScript) {
@@ -768,7 +768,7 @@ cMusicManager::SetUpCorrectAmbienceTrack()
 		else if (TheCamera.DistanceToWater <= 90.0f) {
 			if (CCullZones::bAtBeachForAudio) {
 				if (CWeather::OldWeatherType != WEATHER_HURRICANE && CWeather::NewWeatherType != WEATHER_HURRICANE || CWeather::Wind <= 1.0f)
-					m_nFrontendTrack = STREAMED_SOUND_BEACH_AMBIENT;
+					m_nFrontendTrack = STREAMED_SOUND_SAWMILL;
 				else
 					m_nFrontendTrack = STREAMED_SOUND_HAVANA_BEACH_AMBIENT;
 			}
@@ -1320,27 +1320,12 @@ cMusicManager::DisplayRadioStationName()
 			case RADIO_ESPANTOSO: string = TheText.Get("FEA_FM6"); break;
 			case EMOTION: string = TheText.Get("FEA_FM7"); break;
 			case WAVE: string = TheText.Get("FEA_FM8"); break;
-			case USERTRACK:
+			case 9: string = TheText.Get("FEA_FM9"); break;
+			case 10:
 				if (!SampleManager.IsMP3RadioChannelAvailable())
 					return;
 				string = TheText.Get("FEA_MP3"); break;
-#ifdef RADIO_OFF_TEXT
-			case RADIO_OFF: {
-				// Otherwise RADIO OFF will be seen after pausing-resuming game and Mission Complete text
-				if (!m_bRadioStreamReady || !m_bGameplayAllowsRadio)
-					return;
-
-				extern wchar WideErrorString[];
-
-				string = TheText.Get("FEA_NON");
-				if (string == WideErrorString) {
-					pCurrentStation = nil;
-					return;
-				}
-				break;
-			}
-#endif
-			default: return;
+			default: string = TheText.Get("FEA_NON"); break;
 			};
 
 			if (pCurrentStation != string) {
@@ -1358,21 +1343,22 @@ cMusicManager::DisplayRadioStationName()
 
 			CFont::SetJustifyOff();
 			CFont::SetBackgroundOff();
-			CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
+			CFont::SetDropShadowPosition(2);
+			CFont::SetScale(PSP_SCREEN_SCALE_X(0.5f), PSP_SCREEN_SCALE_Y(0.88f));
 			CFont::SetPropOn();
-			CFont::SetFontStyle(FONT_STANDARD);
+			CFont::SetFontStyle(FONT_BANK);
 			CFont::SetCentreOn();
-			CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
-			CFont::SetColor(CRGBA(0, 0, 0, 255));
-			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);
+			CFont::SetCentreSize(PSP_SCREEN_SCALE_X(260.0f));
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 
 			if (gNumRetunePresses)
-				CFont::SetColor(CRGBA(102, 133, 143, 255));
+				CFont::SetColor(CRGBA(77, 155, 210, 255));
 			else
-				CFont::SetColor(CRGBA(147, 196, 211, 255));
+				CFont::SetColor(CRGBA(77, 155, 210, 255));
 
-			CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_SCALE_Y(22.0f), pCurrentStation);
+			CFont::PrintString(SCREEN_WIDTH / 2, PSP_SCREEN_SCALE_Y(7.0f), pCurrentStation);
 			CFont::DrawFonts();
+			CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 		}
 	}
 	// Always show station text after entering car. Same behaviour as III and SA.
@@ -1403,7 +1389,7 @@ cMusicManager::UsesPoliceRadio(CVehicle *veh)
 bool8
 cMusicManager::UsesTaxiRadio(CVehicle *veh)
 {
-	if (veh->GetModelIndex() != MI_KAUFMAN) return FALSE;
+	if (veh->GetModelIndex() != MI_CABBIE) return FALSE;
 	return CTheScripts::bPlayerHasMetDebbieHarry;
 }