3 files changed, 146 insertions, 63 deletions

diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index ec520eaa..32cc5fae 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -100,13 +100,13 @@ enum eVehicleModel {
 	LINERUN,
 	PEREN,
 	SENTINEL,
-	PATRIOT,
+	RIO,
 	FIRETRUK,
 	TRASH,
 	STRETCH,
 	MANANA,
 	INFERNUS,
-	BLISTA,
+	VOODOO,
 	PONY,
 	MULE,
 	CHEETAH,
@@ -115,11 +115,11 @@ enum eVehicleModel {
 	MOONBEAM,
 	ESPERANT,
 	TAXI,
-	KURUMA,
+	WASHING,
 	BOBCAT,
 	MRWHOOP,
 	BFINJECT,
-	CORPSE,
+	HUNTER,
 	POLICE,
 	ENFORCER,
 	SECURICA,
@@ -128,42 +128,83 @@ enum eVehicleModel {
 	BUS,
 	RHINO,
 	BARRACKS,
-	TRAIN,
+	CUBAN,
 	CHOPPER,
-	DODO,
+	ANGEL,
 	COACH,
 	CABBIE,
 	STALLION,
 	RUMPO,
 	RCBANDIT,
-	BELLYUP,
-	MRWONGS,
-	MAFIA,
-	YARDIE,
-	YAKUZA,
-	DIABLOS,
-	COLUMB,
-	HOODS,
+	ROMERO,
+	PACKER,
+	SENTXS,
+	ADMIRAL,
+	SQUALO,
+	SEASPAR,
+	PIZZABOY,
+	GANGBUR,
 	AIRTRAIN,
 	DEADDODO,
 	SPEEDER,
 	REEFER,
-	PANLANT,
+	TROPIC,
 	FLATBED,
 	YANKEE,
-	ESCAPE,
-	BORGNINE,
-	TOYZ,
-	GHOST,
-	CAR151,
-	CAR152,
-	CAR153,
-	CAR154,
-	CAR155,
-	CAR156,
-	CAR157,
-	CAR158,
-	CAR159,
+	CADDY,
+	ZEBRA,
+	TOPFUN,
+	SKIMMER,
+	PCJ600,
+	FAGGIO,
+	FREEWAY,
+	RCBARON,
+	RCRAIDER,
+	GLENDALE,
+	OCEANIC,
+	SANCHEZ,
+	SPARROW,
+	PATRIOT,
+	LOVEFIST,
+	COASTG,
+	DINGHY,
+	HERMES,
+	SABRE,
+	SABRETUR,
+	PHEONIX,
+	WALTON,
+	REGINA,
+	COMET,
+	DELUXO,
+	BURRITO,
+	SPAND,
+	MARQUIS,
+	BAGGAGE,
+	KAUFMAN,
+	MAVERICK,
+	VCNMAV,
+	RANCHER,
+	FBIRANCH,
+	VIRGO,
+	GREENWOO,
+	JETMAX,
+	HOTRING,
+	SANDKING,
+	BLISTAC,
+	POLMAV,
+	BOXVILLE,
+	BENSON,
+	MESA,
+	RCGOBLIN,
+	HOTRINA,
+	HOTRINB,
+	BLOODRA,
+	BLOODRB,
+	VICECHEE,
+
+// HACK so this compiles
+// TODO(MIAMI): check it out
+DODO = -1
 };
 
 enum PLAY_STATUS : uint8 { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING = 1, PLAY_STATUS_FINISHED = 2 };
@@ -7103,7 +7144,8 @@ struct tVehicleSampleData {
 	uint8 m_bDoorType;
 };
 
-const tVehicleSampleData aVehicleSettings[70] = {{SFX_CAR_REV_2, 2, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, 1},
+// TODO(MIAMI): this is bogus. get the real data in here!
+const tVehicleSampleData aVehicleSettings[110] = {{SFX_CAR_REV_2, 2, SFX_CAR_HORN_JEEP, 26513, SFX_CAR_ALARM_1, 9935, 1},
                                                  {SFX_CAR_REV_1, 1, SFX_CAR_HORN_56CHEV, 11487, SFX_CAR_ALARM_1, 9935, 0},
                                                  {SFX_CAR_REV_8, 8, SFX_CAR_HORN_PORSCHE, 11025, SFX_CAR_ALARM_1, 10928, 1},
                                                  {SFX_CAR_REV_6, 6, SFX_CAR_HORN_TRUCK, 29711, SFX_CAR_ALARM_1, 9935, 2},
@@ -7172,6 +7214,46 @@ const tVehicleSampleData aVehicleSettings[70] = {{SFX_CAR_REV_2, 2, SFX_CAR_HORN
                                                  {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
                                                  {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
                                                  {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
+                                                 {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0},
                                                  {SFX_CAR_REV_1, 1, SFX_CAR_HORN_JEEP, 21043, SFX_CAR_ALARM_1, 9935, 0}};
 
 void
@@ -7989,7 +8071,7 @@ cAudioManager::ProcessVehicle(CVehicle *veh)
 	if (handling)
 		params.m_pTransmission = &handling->Transmission;
 
-	params.m_nIndex = veh->GetModelIndex() - 90;
+	params.m_nIndex = veh->GetModelIndex() - MI_FIRST_VEHICLE;
 	if (params.m_pVehicle->GetStatus() == STATUS_SIMPLE)
 		velChange = params.m_pVehicle->AutoPilot.m_fMaxTrafficSpeed * 0.02f;
 	else
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index fd02691e..841573a9 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -66,7 +66,8 @@ cMusicManager::PlayerInCar()
 	case MI_TRAIN:
 	case MI_SPEEDER:
 	case MI_REEFER:
-	case MI_GHOST: return false;
+//	case MI_GHOST:
+		return false;
 	default: return true;
 	}
 }
diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp
index f7c27515..abacb425 100644
--- a/src/audio/PoliceRadio.cpp
+++ b/src/audio/PoliceRadio.cpp
@@ -541,39 +541,41 @@ cAudioManager::SetupSuspectLastSeenReport()
 					color_pre_modifier = gCarColourTable[color1][0];
 					color_post_modifier = gCarColourTable[color1][2];
 					switch (veh->GetModelIndex()) {
+// TODO(MIAMI): just making this compile
 #ifdef FIX_BUGS
-					case MI_COLUMB:
-						main_color = SFX_POLICE_RADIO_BLUE;
-						color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
+	//				case MI_COLUMB:
+	//					main_color = SFX_POLICE_RADIO_BLUE;
+	//					color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
 #endif
 					case MI_LANDSTAL:
-					case MI_BLISTA: sample = SFX_POLICE_RADIO_CRUISER; break;
+	//				case MI_BLISTA: 
+						sample = SFX_POLICE_RADIO_CRUISER; break;
 #ifdef FIX_BUGS
-					case MI_YARDIE:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_RED;
-						color_post_modifier = SFX_POLICE_RADIO_YELLOW;
-						sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
-					case MI_DIABLOS:
-						main_color = SFX_POLICE_RADIO_BLACK;
+	//				case MI_YARDIE:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_RED;
+	//					color_post_modifier = SFX_POLICE_RADIO_YELLOW;
+	//					sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
+	//				case MI_DIABLOS:
+	//					main_color = SFX_POLICE_RADIO_BLACK;
 #endif
 					case MI_IDAHO:
 					case MI_STALLION: sample = SFX_POLICE_RADIO_CONVERTIBLE; break;
 #ifdef FIX_BUGS
-					case MI_YAKUZA:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_SILVER;
-						color_post_modifier = SFX_POLICE_RADIO_RED;
+	//				case MI_YAKUZA:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_SILVER;
+	//					color_post_modifier = SFX_POLICE_RADIO_RED;
 #endif
 					case MI_STINGER:
 					case MI_INFERNUS:
 					case MI_CHEETAH:
 					case MI_BANSHEE: sample = SFX_POLICE_RADIO_SPORTS_CAR; break;
 #ifdef FIX_BUGS
-					case MI_MAFIA:
-						color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_GREY;
-					case MI_KURUMA:
+	//				case MI_MAFIA:
+	//					color_pre_modifier = color_post_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_GREY;
+					case MI_WASHING:
 #endif
 					case MI_PEREN:
 					case MI_SENTINEL:
@@ -588,21 +590,18 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_TRASH:
 					case MI_BARRACKS: sample = SFX_POLICE_RADIO_TRUCK; break;
 					case MI_STRETCH: sample = SFX_POLICE_RADIO_LIMO; break;
-#ifdef FIX_BUGS
-					case MI_CORPSE:
-#endif
 					case MI_MANANA:
 					case MI_ESPERANT: sample = SFX_POLICE_RADIO_2_DOOR; break;
 #ifdef FIX_BUGS
-					case MI_HOODS:
-						color_pre_modifier = TOTAL_AUDIO_SAMPLES;
-						main_color = SFX_POLICE_RADIO_BLUE;
-						color_post_modifier = SFX_POLICE_RADIO_GREEN;
-					case MI_BELLYUP:
+	//				case MI_HOODS:
+	//					color_pre_modifier = TOTAL_AUDIO_SAMPLES;
+	//					main_color = SFX_POLICE_RADIO_BLUE;
+	//					color_post_modifier = SFX_POLICE_RADIO_GREEN;
+	//				case MI_BELLYUP:
 					case MI_YANKEE:
-					case MI_TOYZ:
-					case MI_MRWONGS:
-					case MI_PANLANT:
+					case MI_TOPFUN:
+	//				case MI_MRWONGS:
+	//				case MI_PANLANT:
 #endif
 					case MI_PONY:
 					case MI_MULE:
@@ -613,7 +612,8 @@ cAudioManager::SetupSuspectLastSeenReport()
 					case MI_AMBULAN: sample = SFX_POLICE_RADIO_AMBULANCE; break;
 					case MI_TAXI:
 					case MI_CABBIE:
-					case MI_BORGNINE: sample = SFX_POLICE_RADIO_TAXI; break;
+					case MI_ZEBRA: sample = SFX_POLICE_RADIO_TAXI; break;
+					case MI_KAUFMAN: sample = SFX_POLICE_RADIO_TAXI; break;
 					case MI_MRWHOOP:
 						sample = SFX_POLICE_RADIO_ICE_CREAM_VAN;
 						break;
@@ -622,7 +622,7 @@ cAudioManager::SetupSuspectLastSeenReport()
 #ifdef FIX_BUGS
 					case MI_SPEEDER:
 					case MI_REEFER:
-					case MI_GHOST:
+	//				case MI_GHOST:
 #endif
 					case MI_PREDATOR: sample = SFX_POLICE_RADIO_BOAT; break;
 					case MI_BUS: