From 04a91761df7c90ed16b37407d65d8674033efd3f Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 2 Jun 2020 23:34:53 +0200
Subject: some vehicle cleanup

---
 src/modelinfo/VehicleModelInfo.cpp | 21 +++++++++++----------
 src/modelinfo/VehicleModelInfo.h   | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 10 deletions(-)

(limited to 'src/modelinfo')

diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 74285c19..d8b388d5 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -16,6 +16,7 @@
 #include "Train.h"
 #include "Plane.h"
 #include "Heli.h"
+#include "Bike.h"
 #include "ModelIndices.h"
 #include "ModelInfo.h"
 
@@ -120,16 +121,16 @@ RwObjectNameIdAssocation planeIds[] = {
 };
 
 RwObjectNameIdAssocation bikeIds[] = {
-	{ "chassis_dummy",	1,	0 },
-	{ "forks_front",	2,	0 },
-	{ "forks_rear",		3,	0 },
-	{ "wheel_front",	4,	0 },
-	{ "wheel_rear",		5,	0 },
-	{ "mudguard",		6,	0 },
-	{ "ped_frontseat",	2,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
-	{ "headlights",		0,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
-	{ "taillights",		1,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
-	{ "exhaust",		9,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
+	{ "chassis_dummy",	BIKE_CHASSIS,	0 },
+	{ "forks_front",	BIKE_FORKS_FRONT,	0 },
+	{ "forks_rear",		BIKE_FORKS_REAR,	0 },
+	{ "wheel_front",	BIKE_WHEEL_FRONT,	0 },
+	{ "wheel_rear",		BIKE_WHEEL_REAR,	0 },
+	{ "mudguard",		BIKE_MUDGUARD,	0 },
+	{ "ped_frontseat",	CAR_POS_FRONTSEAT,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
+	{ "headlights",		CAR_POS_HEADLIGHTS,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
+	{ "taillights",		CAR_POS_TAILLIGHTS,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
+	{ "exhaust",		CAR_POS_EXHAUST,	VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
 	{ "extra1",		0,	VEHICLE_FLAG_DRAWLAST | VEHICLE_FLAG_COMP | CLUMP_FLAG_NO_HIERID },
 	{ "extra2",		0,	VEHICLE_FLAG_DRAWLAST | VEHICLE_FLAG_COMP | CLUMP_FLAG_NO_HIERID },
 	{ "extra3",		0,	VEHICLE_FLAG_DRAWLAST | VEHICLE_FLAG_COMP | CLUMP_FLAG_NO_HIERID },
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index ba25d3cd..468ce96d 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -35,6 +35,43 @@ enum eVehicleType {
 	NUM_VEHICLE_TYPES
 };
 
+enum eCarPositions
+{
+	CAR_POS_HEADLIGHTS,
+	CAR_POS_TAILLIGHTS,
+	CAR_POS_FRONTSEAT,
+	CAR_POS_BACKSEAT,
+	// these are unused so we don't know the actual values
+	CAR_POS_REVERSELIGHTS,
+	CAR_POS_BRAKELIGHTS,
+	CAR_POS_INDICATORS_FRONT,
+	CAR_POS_INDICATORS_BACK,
+	CAR_POS_STEERWHEEL,
+	//
+	CAR_POS_EXHAUST
+};
+
+enum eBoatPositions
+{
+	BOAT_POS_FRONTSEAT
+};
+
+enum eTrainPositions
+{
+	TRAIN_POS_LIGHT_FRONT,
+	TRAIN_POS_LIGHT_REAR,
+	TRAIN_POS_LEFT_ENTRY,
+	TRAIN_POS_MID_ENTRY,
+	TRAIN_POS_RIGHT_ENTRY
+};
+
+enum ePlanePositions
+{
+	PLANE_POS_LIGHT_LEFT,
+	PLANE_POS_LIGHT_RIGHT,
+	PLANE_POS_LIGHT_TAIL,
+};
+
 enum {
 	NUM_VEHICLE_POSITIONS = 10
 };
@@ -100,6 +137,7 @@ public:
 	void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
 	void PreprocessHierarchy(void);
 	void GetWheelPosn(int32 n, CVector &pos);
+	CVector &GetFrontSeatPosn(void) { return m_positions[m_vehicleType == VEHICLE_TYPE_BOAT ? BOAT_POS_FRONTSEAT : CAR_POS_FRONTSEAT]; };
 
 	int32 ChooseComponent(void);
 	int32 ChooseSecondComponent(void);
-- 
cgit v1.2.3