1 files changed, 46 insertions, 81 deletions

diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h
index eb5275ad..7b9bebef 100644
--- a/src/entities/Vehicle.h
+++ b/src/entities/Vehicle.h
@@ -14,14 +14,6 @@ enum {
 	PERMANENT_VEHICLE = 4,
 };
 
-
-enum {
-	GETTING_IN_OUT_FL = 1,
-	GETTING_IN_OUT_RL = 2,
-	GETTING_IN_OUT_FR = 4,
-	GETTING_IN_OUT_RR = 8
-};
-
 enum eCarLock {
 	CARLOCK_NOT_USED,
 	CARLOCK_UNLOCKED,
@@ -33,82 +25,55 @@ enum eCarLock {
 	CARLOCK_SKIP_SHUT_DOORS
 };
 
-// TODO: where is this used? Is Vehicle.h the right file?
-enum eVehicleModel
+
+enum eCarNodes
+{
+	CAR_WHEEL_RF = 1,
+	CAR_WHEEL_RM,
+	CAR_WHEEL_RB,
+	CAR_WHEEL_LF,
+	CAR_WHEEL_LM,
+	CAR_WHEEL_LB,
+	CAR_BUMP_FRONT,
+	CAR_BUMP_REAR,
+	CAR_WING_RF,
+	CAR_WING_RR,
+	CAR_DOOR_RF,
+	CAR_DOOR_RR,
+	CAR_WING_LF,
+	CAR_WING_LR,
+	CAR_DOOR_LF,
+	CAR_DOOR_LR,
+	CAR_BONNET,
+	CAR_BOOT,
+	CAR_WINDSCREEN,
+	NUM_CAR_NODES,
+};
+
+enum
+{
+	CAR_POS_HEADLIGHTS,
+	CAR_POS_TAILLIGHTS,
+	CAR_POS_FRONTSEAT,
+	CAR_POS_BACKSEAT,
+	CAR_POS_EXHAUST		= 9,
+};
+
+enum eDoors
 {
-	LANDSTAL,
-	IDAHO,
-	STINGER,
-	LINERUN,
-	PEREN,
-	SENTINEL,
-	PATRIOT,
-	FIRETRUK,
-	TRASH,
-	STRETCH,
-	MANANA,
-	INFERNUS,
-	BLISTA,
-	PONY,
-	MULE,
-	CHEETAH,
-	AMBULAN,
-	FBICAR,
-	MOONBEAM,
-	ESPERANT,
-	TAXI,
-	KURUMA,
-	BOBCAT,
-	MRWHOOP,
-	BFINJECT,
-	CORPSE,
-	POLICE,
-	ENFORCER,
-	SECURICA,
-	BANSHEE,
-	PREDATOR,
-	BUS,
-	RHINO,
-	BARRACKS,
-	TRAIN,
-	CHOPPER,
-	DODO,
-	COACH,
-	CABBIE,
-	STALLION,
-	RUMPO,
-	RCBANDIT,
-	BELLYUP,
-	MRWONGS,
-	MAFIA,
-	YARDIE,
-	YAKUZA,
-	DIABLOS,
-	COLUMB,
-	HOODS,
-	AIRTRAIN,
-	DEADDODO,
-	SPEEDER,
-	REEFER,
-	PANLANT,
-	FLATBED,
-	YANKEE,
-	ESCAPE,
-	BORGNINE,
-	TOYZ,
-	GHOST,
-	CAR151,
-	CAR152,
-	CAR153,
-	CAR154,
-	CAR155,
-	CAR156,
-	CAR157,
-	CAR158,
-	CAR159,
+	DOOR_BONNET = 0,
+	DOOR_BOOT,
+	DOOR_FRONT_LEFT,
+	DOOR_FRONT_RIGHT,
+	DOOR_REAR_LEFT,
+	DOOR_REAR_RIGHT
 };
 
-enum eDoors {
+enum {
+	GETTING_IN_OUT_FL = 1,
+	GETTING_IN_OUT_RL = 2,
+	GETTING_IN_OUT_FR = 4,
+	GETTING_IN_OUT_RR = 8
 };
 
 class CVehicle : public CPhysical