5 files changed, 13 insertions, 23 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index ec71f690..79d3f6af 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -768,7 +768,7 @@ CAutomobile::ProcessControl(void)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_LEFT].surfaceB);
 				WheelState[CARWHEEL_FRONT_LEFT] = m_aWheelState[CARWHEEL_FRONT_LEFT];
 
-				if(Damage.GetWheelStatus(VEHWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
+				if(Damage.GetWheelStatus(CARWHEEL_FRONT_LEFT) == WHEEL_STATUS_BURST)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_FRONT_LEFT], contactPoints[CARWHEEL_FRONT_LEFT],
 						m_nWheelsOnGround, fThrust,
@@ -802,7 +802,7 @@ CAutomobile::ProcessControl(void)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_FRONT_RIGHT].surfaceB);
 				WheelState[CARWHEEL_FRONT_RIGHT] = m_aWheelState[CARWHEEL_FRONT_RIGHT];
 
-				if(Damage.GetWheelStatus(VEHWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
+				if(Damage.GetWheelStatus(CARWHEEL_FRONT_RIGHT) == WHEEL_STATUS_BURST)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_FRONT_RIGHT], contactPoints[CARWHEEL_FRONT_RIGHT],
 						m_nWheelsOnGround, fThrust,
@@ -883,7 +883,7 @@ CAutomobile::ProcessControl(void)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_LEFT].surfaceB);
 				WheelState[CARWHEEL_REAR_LEFT] = m_aWheelState[CARWHEEL_REAR_LEFT];
 
-				if(Damage.GetWheelStatus(VEHWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
+				if(Damage.GetWheelStatus(CARWHEEL_REAR_LEFT) == WHEEL_STATUS_BURST)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_LEFT], contactPoints[CARWHEEL_REAR_LEFT],
 						m_nWheelsOnGround, fThrust,
@@ -917,7 +917,7 @@ CAutomobile::ProcessControl(void)
 					adhesion *= CSurfaceTable::GetWetMultiplier(m_aWheelColPoints[CARWHEEL_REAR_RIGHT].surfaceB);
 				WheelState[CARWHEEL_REAR_RIGHT] = m_aWheelState[CARWHEEL_REAR_RIGHT];
 
-				if(Damage.GetWheelStatus(VEHWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
+				if(Damage.GetWheelStatus(CARWHEEL_REAR_RIGHT) == WHEEL_STATUS_BURST)
 					ProcessWheel(wheelFwd, wheelRight,
 						contactSpeeds[CARWHEEL_REAR_RIGHT], contactPoints[CARWHEEL_REAR_RIGHT],
 						m_nWheelsOnGround, fThrust,
@@ -3946,10 +3946,10 @@ void
 CAutomobile::BurstTyre(uint8 wheel)
 {
 	switch(wheel){
-	case CAR_PIECE_WHEEL_LF: wheel = VEHWHEEL_FRONT_LEFT; break;
-	case CAR_PIECE_WHEEL_LR: wheel = VEHWHEEL_REAR_LEFT; break;
-	case CAR_PIECE_WHEEL_RF: wheel = VEHWHEEL_FRONT_RIGHT; break;
-	case CAR_PIECE_WHEEL_RR: wheel = VEHWHEEL_REAR_RIGHT; break;
+	case CAR_PIECE_WHEEL_LF: wheel = CARWHEEL_FRONT_LEFT; break;
+	case CAR_PIECE_WHEEL_RF: wheel = CARWHEEL_FRONT_RIGHT; break;
+	case CAR_PIECE_WHEEL_LR: wheel = CARWHEEL_REAR_LEFT; break;
+	case CAR_PIECE_WHEEL_RR: wheel = CARWHEEL_REAR_RIGHT; break;
 	}
 
 	int status = Damage.GetWheelStatus(wheel);
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index 604bed17..a5bee226 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -30,8 +30,6 @@ enum eCarNodes
 	NUM_CAR_NODES,
 };
 
-// These are used for all the wheel arrays
-// DON'T confuse with VEHWHEEL, which are vehicle components
 enum {
 	CARWHEEL_FRONT_LEFT,
 	CARWHEEL_REAR_LEFT,
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h
index 6d877d82..0e134310 100644
--- a/src/vehicles/Cranes.h
+++ b/src/vehicles/Cranes.h
@@ -11,7 +11,7 @@ class CBuilding;
 class CCrane
 {
 public:
-	enum CraneState : uint8 {
+	enum CraneState {
 		IDLE = 0,
 		GOING_TOWARDS_TARGET = 1,
 		LIFTING_TARGET = 2,
@@ -19,7 +19,7 @@ public:
 		ROTATING_TARGET = 4,
 		DROPPING_TARGET = 5
 	};
-	enum CraneStatus : uint8 {
+	enum CraneStatus {
 		NONE = 0,
 		ACTIVATED = 1,
 		DEACTIVATED = 2
@@ -47,8 +47,8 @@ public:
 	CVector2D m_vecHookVelocity;
 	CVehicle *m_pVehiclePickedUp;
 	uint32 m_nTimeForNextCheck;
-	CraneStatus m_nCraneStatus;
-	CraneState m_nCraneState;
+	uint8 m_nCraneStatus;
+	uint8 m_nCraneState;
 	uint8 m_nVehiclesCollected;
 	bool m_bIsCrusher;
 	bool m_bIsMilitaryCrane;
diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 4d3b8389..23bd9681 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -65,7 +65,7 @@ enum tVehicleType
 	NUMHANDLINGS
 };
 
-enum tField : uint32 // most likely a handling field enum, never used so :shrug:
+enum tField // most likely a handling field enum, never used so :shrug:
 {
 
 };
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 3933f1dd..7066a0ea 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -57,14 +57,6 @@ enum eLights
 	VEHLIGHT_REAR_RIGHT,
 };
 
-enum eWheels
-{
-	VEHWHEEL_FRONT_LEFT,
-	VEHWHEEL_FRONT_RIGHT,
-	VEHWHEEL_REAR_LEFT,
-	VEHWHEEL_REAR_RIGHT,
-};
-
 enum
 {
 	CAR_PIECE_BONNET = 1,