1 files changed, 38 insertions, 55 deletions

diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 8d290f7d..2d49761c 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -36,6 +36,7 @@ enum tVehicleType
 	HANDLING_RHINO,
 	HANDLING_BARRACKS,
 	HANDLING_TRAIN,
+	HANDLING_FERRY,
 	HANDLING_HELI,
 	HANDLING_DODO,
 	HANDLING_COACH,
@@ -48,76 +49,51 @@ enum tVehicleType
 	HANDLING_DEADDODO,
 	HANDLING_FLATBED,
 	HANDLING_YANKEE,
-	HANDLING_GOLFCART,
-	HANDLING_VOODOO,
-	HANDLING_WASHING,
-	HANDLING_CUBAN,
-	HANDLING_ROMERO,
-	HANDLING_PACKER,
-	HANDLING_ADMIRAL,
-	HANDLING_GANGBUR,
-	HANDLING_ZEBRA,
-	HANDLING_TOPFUN,
-	HANDLING_GLENDALE,
-	HANDLING_OCEANIC,
-	HANDLING_HERMES,
-	HANDLING_SABRE1,
-	HANDLING_SABRETUR,
-	HANDLING_PHEONIX,
-	HANDLING_WALTON,
-	HANDLING_REGINA,
-	HANDLING_COMET,
-	HANDLING_DELUXO,
-	HANDLING_BURRITO,
-	HANDLING_SPAND,
-	HANDLING_BAGGAGE,
-	HANDLING_KAUFMAN,
-	HANDLING_RANCHER,
-	HANDLING_FBIRANCH,
-	HANDLING_VIRGO,
-	HANDLING_GREENWOO,
-	HANDLING_HOTRING,
-	HANDLING_SANDKING,
-	HANDLING_BLISTAC,
-	HANDLING_BOXVILLE,
-	HANDLING_BENSON,
-	HANDLING_DESPERAD,
-	HANDLING_LOVEFIST,
-	HANDLING_BLOODRA,
-	HANDLING_BLOODRB,
+	HANDLING_BLISTA,
+	HANDLING_BELLYUP,
+	HANDLING_MRWONGS,
+	HANDLING_YARDIE,
+	HANDLING_YAKUZA,
+	HANDLING_DIABLOS,
+	HANDLING_COLUMB,
+	HANDLING_HOODS,
+	HANDLING_PANLANT,
+	HANDLING_BORGNINE,
+	HANDLING_CAMPVAN,
+	HANDLING_BALLOT,
+	HANDLING_SPIDER,
+	HANDLING_SHELBY,
+	HANDLING_PONTIAC,
+	HANDLING_ESPRIT,
+	HANDLING_MINI,
+	HANDLING_HOTROD,
+	HANDLING_SINDACCO,
+	HANDLING_FORELLI,
 
 	HANDLING_BIKE,
 	HANDLING_MOPED,
 	HANDLING_DIRTBIKE,
 	HANDLING_ANGEL,
+	HANDLING_DIRTBIK2,
+	HANDLING_ANGE2,
 	HANDLING_FREEWAY,
 
 	HANDLING_PREDATOR,
 	HANDLING_SPEEDER,
 	HANDLING_REEFER,
-	HANDLING_RIO,
-	HANDLING_SQUALO,
-	HANDLING_TROPIC,
-	HANDLING_COASTGRD,
-	HANDLING_DINGHY,
-	HANDLING_MARQUIS,
-	HANDLING_CUPBOAT,
-	HANDLING_SEAPLANE,	// both boat and plane!
-	HANDLING_SPARROW,
-	HANDLING_SEASPAR,
+
 	HANDLING_MAVERICK,
 	HANDLING_COASTMAV,
 	HANDLING_POLMAV,
 	HANDLING_HUNTER,
-	HANDLING_RCBARON,
 	HANDLING_RCGOBLIN,
 	HANDLING_RCCOPTER,
 
 	NUMHANDLINGS,
 
 	NUMBIKEHANDLINGS = HANDLING_FREEWAY+1 - HANDLING_BIKE,
-	NUMFLYINGHANDLINGS = HANDLING_RCCOPTER+1 - HANDLING_SEAPLANE,
-	NUMBOATHANDLINGS = HANDLING_SEAPLANE+1 - HANDLING_PREDATOR,
+	NUMFLYINGHANDLINGS = HANDLING_RCCOPTER+1 - HANDLING_MAVERICK,
+	NUMBOATHANDLINGS = HANDLING_REEFER+1 - HANDLING_PREDATOR,
 };
 
 enum tField // most likely a handling field enum, never used so :shrug:
@@ -155,19 +131,21 @@ enum
 	HANDLING_NARROW_FRONTW = 0x2000000,
 	HANDLING_GOOD_INSAND = 0x4000000,
 	HANDLING_UNKNOWN = 0x8000000,	// something for helis and planes
+	HANDLING_FORCE_GRND_CLR = 0x10000000
 };
 
 struct tHandlingData
 {
-	tVehicleType nIdentifier;
 	float fMass;
-	float fInvMass;
 	float fTurnMass;
-	CVector Dimension;
+	float fTractionMultiplier;
+	float fCollisionDamageMultiplier;
+	tVehicleType nIdentifier;
+	float fInvMass;
+	float fDragMult;
 	CVector CentreOfMass;
 	int8 nPercentSubmerged;
 	float fBuoyancy;
-	float fTractionMultiplier;
 	cTransmission Transmission;
 	float fBrakeDeceleration;
 	float fBrakeBias;
@@ -182,12 +160,17 @@ struct tHandlingData
 	float fSuspensionLowerLimit;
 	float fSuspensionBias;
 	float fSuspensionAntidiveMultiplier;
-	float fCollisionDamageMultiplier;
 	uint32 Flags;
 	float fSeatOffsetDistance;
 	int32 nMonetaryValue;
 	int8 FrontLights;
 	int8 RearLights;
+	int unk[4];
+
+	float GetMass(void) const { return fMass; }
+	float GetTurnMass(void) const { return fTurnMass; }
+	float GetTractionMultiplier(void) const { return fTractionMultiplier; }
+	float GetCollisionDamageMultiplier(void) const { return fCollisionDamageMultiplier; }
 };
 
 struct tBikeHandlingData