2 files changed, 72 insertions, 36 deletions

diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 42c95894..938eda37 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -257,19 +257,20 @@ enum
 	MI_BUSKER4,
 	// three more peds possible
 
-	MI_LANDSTAL = 130,
+	MI_FIRST_VEHICLE = 130,
+	MI_LANDSTAL = MI_FIRST_VEHICLE,
 	MI_IDAHO,
 	MI_STINGER,
 	MI_LINERUN,
 	MI_PEREN,
 	MI_SENTINEL,
-	MI_PATRIOT,
+	MI_RIO,
 	MI_FIRETRUCK,
 	MI_TRASH,
 	MI_STRETCH,
 	MI_MANANA,
 	MI_INFERNUS,
-	MI_BLISTA,
+	MI_VOODOO,
 	MI_PONY,
 	MI_MULE,
 	MI_CHEETAH,
@@ -278,11 +279,11 @@ enum
 	MI_MOONBEAM,
 	MI_ESPERANT,
 	MI_TAXI,
-	MI_KURUMA,
+	MI_WASHING,
 	MI_BOBCAT,
 	MI_MRWHOOP,
 	MI_BFINJECT,
-	MI_CORPSE,
+	MI_HUNTER,
 	MI_POLICE,
 	MI_ENFORCER,
 	MI_SECURICA,
@@ -291,38 +292,82 @@ enum
 	MI_BUS,
 	MI_RHINO,
 	MI_BARRACKS,
-	MI_TRAIN,
+	MI_CUBAN,
 	MI_CHOPPER,
-	MI_DODO,
+	MI_ANGEL,
 	MI_COACH,
 	MI_CABBIE,
 	MI_STALLION,
 	MI_RUMPO,
 	MI_RCBANDIT,
-	MI_BELLYUP,
-	MI_MRWONGS,
-	MI_MAFIA,
-	MI_YARDIE,
-	MI_YAKUZA,
-	MI_DIABLOS,
-	MI_COLUMB ,
-	MI_HOODS,
+	MI_ROMERO,
+	MI_PACKER,
+	MI_SENTXS,
+	MI_ADMIRAL,
+	MI_SQUALO,
+	MI_SEASPAR,
+	MI_PIZZABOY,
+	MI_GANGBUR,
 	MI_AIRTRAIN,
 	MI_DEADDODO,
 	MI_SPEEDER,
 	MI_REEFER,
-	MI_PANLANT,
+	MI_TROPIC,
 	MI_FLATBED,
 	MI_YANKEE,
-	MI_ESCAPE,
-	MI_BORGNINE,
-	MI_TOYZ,
-	MI_GHOST,
-
-	// leftovers on PC
-	MI_MIAMI_RCBARON = 194,
-	MI_MIAMI_RCRAIDER = 195,
-	MI_MIAMI_SPARROW = 199,
+	MI_CADDY,
+	MI_ZEBRA,
+	MI_TOPFUN,
+	MI_SKIMMER,
+	MI_PCJ600,
+	MI_FAGGIO,
+	MI_FREEWAY,
+	MI_RCBARON,
+	MI_RCRAIDER,
+	MI_GLENDALE,
+	MI_OCEANIC,
+	MI_SANCHEZ,
+	MI_SPARROW,
+	MI_PATRIOT,
+	MI_LOVEFIST,
+	MI_COASTG,
+	MI_DINGHY,
+	MI_HERMES,
+	MI_SABRE,
+	MI_SABRETUR,
+	MI_PHEONIX,
+	MI_WALTON,
+	MI_REGINA,
+	MI_COMET,
+	MI_DELUXO,
+	MI_BURRITO,
+	MI_SPAND,
+	MI_MARQUIS,
+	MI_BAGGAGE,
+	MI_KAUFMAN,
+	MI_MAVERICK,
+	MI_VCNMAV,
+	MI_RANCHER,
+	MI_FBIRANCH,
+	MI_VIRGO,
+	MI_GREENWOO,
+	MI_JETMAX,
+	MI_HOTRING,
+	MI_SANDKING,
+	MI_BLISTAC,
+	MI_POLMAV,
+	MI_BOXVILLE,
+	MI_BENSON,
+	MI_MESA,
+	MI_RCGOBLIN,
+	MI_HOTRINA,
+	MI_HOTRINB,
+	MI_BLOODRA,
+	MI_BLOODRB,
+	MI_VICECHEE,
+	// HACK
+	MI_TRAIN = -1,
+	MI_DODO = -2,
 
 	MI_GRENADE = 258,
 	MI_AK47,
@@ -393,6 +438,7 @@ IsBodyPart(int16 id)
 }
 
 // This is bad and should perhaps not be used
+/*
 inline bool
 IsBoatModel(int16 id)
 {
@@ -401,6 +447,7 @@ IsBoatModel(int16 id)
 		id == MI_SPEEDER ||
 		id == MI_GHOST;
 }
+*/
 
 inline bool
 IsPedModel(int16 id)
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index 9992ab98..6946c5c1 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -36,17 +36,6 @@ enum eVehicleType {
 };
 
 enum {
-	VEHICLE_CLASS_POOR,
-	VEHICLE_CLASS_RICH,
-	VEHICLE_CLASS_EXECUTIVE,
-	VEHICLE_CLASS_WORKER,
-	VEHICLE_CLASS_SPECIAL,
-	VEHICLE_CLASS_BIG,
-	VEHICLE_CLASS_TAXI,
-	NUM_VEHICLE_CLASSES
-};
-
-enum {
 	NUM_VEHICLE_POSITIONS = 10
 };