1 files changed, 189 insertions, 55 deletions

diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index cc6428e1..51e2604c 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -127,7 +127,7 @@ cHandlingDataMgr::Initialise(void)
 {
 	LoadHandlingData();
 	field_0 = 0.1f;
-	field_4 = 0.9f;
+	fWheelFriction = 0.9f;
 	field_8 = 1.0f;
 	field_C = 0.8f;
 	field_10 = 0.98f;
@@ -143,6 +143,9 @@ cHandlingDataMgr::LoadHandlingData(void)
 	int field, handlingId;
 	int keepGoing;
 	tHandlingData *handling;
+	tFlyingHandlingData *flyingHandling;
+	tBoatHandlingData *boatHandling;
+	tBikeHandlingData *bikeHandling;
 
 	CFileMgr::SetDir("DATA");
 	CFileMgr::LoadFile(HandlingFilename, work_buff, sizeof(work_buff), "r");
@@ -151,6 +154,9 @@ cHandlingDataMgr::LoadHandlingData(void)
 	start = (char*)work_buff;
 	end = start+1;
 	handling = nil;
+	flyingHandling = nil;
+	boatHandling = nil;
+	bikeHandling = nil;
 	keepGoing = 1;
 
 	while(keepGoing){
@@ -166,61 +172,158 @@ cHandlingDataMgr::LoadHandlingData(void)
 		// yeah, this is kinda crappy
 		if(strncmp(line, ";the end", 9) == 0)
 			keepGoing = 0;
-//		else if(line[0] != ';'){
-// TODO(MIAMI): read boat, bike, flying values
-		else if(line[0] != ';' && line[0] != '%' && line[0] != '!' && line[0] != '$'){
-			field = 0;
-			strcpy(delim, " \t");
-			// FIX: game seems to use a do-while loop here
-			for(word = strtok(line, delim); word; word = strtok(nil, delim)){
-				switch(field){
-				case  0:
-					handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
-					assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
-					handling = &HandlingData[handlingId];
-					handling->nIdentifier = (eHandlingId)handlingId;
-					break;
-				case  1: handling->fMass = strtod(word, nil); break;
-				case  2: handling->Dimension.x = strtod(word, nil); break;
-				case  3: handling->Dimension.y = strtod(word, nil); break;
-				case  4: handling->Dimension.z = strtod(word, nil); break;
-				case  5: handling->CentreOfMass.x = strtod(word, nil); break;
-				case  6: handling->CentreOfMass.y = strtod(word, nil); break;
-				case  7: handling->CentreOfMass.z = strtod(word, nil); break;
-				case  8: handling->nPercentSubmerged = atoi(word); break;
-				case  9: handling->fTractionMultiplier = strtod(word, nil); break;
-				case 10: handling->fTractionLoss = strtod(word, nil); break;
-				case 11: handling->fTractionBias = strtod(word, nil); break;
-				case 12: handling->Transmission.nNumberOfGears = atoi(word); break;
-				case 13: handling->Transmission.fMaxVelocity = strtod(word, nil); break;
-				case 14: handling->Transmission.fEngineAcceleration = strtod(word, nil) * 0.4f; break;
-				case 15: handling->Transmission.nDriveType = word[0]; break;
-				case 16: handling->Transmission.nEngineType = word[0]; break;
-				case 17: handling->fBrakeDeceleration = strtod(word, nil); break;
-				case 18: handling->fBrakeBias = strtod(word, nil); break;
-				case 19: handling->bABS = !!atoi(word); break;
-				case 20: handling->fSteeringLock = strtod(word, nil); break;
-				case 21: handling->fSuspensionForceLevel = strtod(word, nil); break;
-				case 22: handling->fSuspensionDampingLevel = strtod(word, nil); break;
-				case 23: handling->fSeatOffsetDistance = strtod(word, nil); break;
-				case 24: handling->fCollisionDamageMultiplier = strtod(word, nil); break;
-				case 25: handling->nMonetaryValue = atoi(word); break;
-				case 26: handling->fSuspensionUpperLimit = strtod(word, nil); break;
-				case 27: handling->fSuspensionLowerLimit = strtod(word, nil); break;
-				case 28: handling->fSuspensionBias = strtod(word, nil); break;
-				case 29:
-					// TODO(MIAMI): suspension anti-dive multiplier
-					break;
-				case 30:
-					sscanf(word, "%x", &handling->Flags);
-					handling->Transmission.Flags = handling->Flags;
-					break;
-				case 31: handling->FrontLights = atoi(word); break;
-				case 32: handling->RearLights = atoi(word); break;
+		else if(line[0] != ';'){
+			if(line[0] == '!'){
+				// Bike data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						bikeHandling = GetBikePointer(handlingId);
+						bikeHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: bikeHandling->fLeanFwdCOM = atof(word); break;
+					case  3: bikeHandling->fLeanFwdForce = atof(word); break;
+					case  4: bikeHandling->fLeanBakCOM = atof(word); break;
+					case  5: bikeHandling->fLeanBackForce = atof(word); break;
+					case  6: bikeHandling->fMaxLean = atof(word); break;
+					case  7: bikeHandling->fFullAnimLean = atof(word); break;
+					case  8: bikeHandling->fDesLean = atof(word); break;
+					case  9: bikeHandling->fSpeedSteer = atof(word); break;
+					case 10: bikeHandling->fSlipSteer = atof(word); break;
+					case 11: bikeHandling->fNoPlayerCOMz = atof(word); break;
+					case 12: bikeHandling->fWheelieAng = atof(word); break;
+					case 13: bikeHandling->fStoppieAng = atof(word); break;
+					case 14: bikeHandling->fWheelieSteer = atof(word); break;
+					case 15: bikeHandling->fWheelieStabMult = atof(word); break;
+					case 16: bikeHandling->fStoppieStabMult = atof(word); break;
+					}
+					field++;
 				}
-				field++;
+				ConvertBikeDataToGameUnits(bikeHandling);
+			}else if(line[0] == '$'){
+				// Flying data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						flyingHandling = GetFlyingPointer(handlingId);
+						flyingHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: flyingHandling->fThrust = atof(word); break;
+					case  3: flyingHandling->fThrustFallOff = atof(word); break;
+					case  4: flyingHandling->fYaw = atof(word); break;
+					case  5: flyingHandling->fYawStab = atof(word); break;
+					case  6: flyingHandling->fSideSlip = atof(word); break;
+					case  7: flyingHandling->fRoll = atof(word); break;
+					case  8: flyingHandling->fRollStab = atof(word); break;
+					case  9: flyingHandling->fPitch = atof(word); break;
+					case 10: flyingHandling->fPitchStab = atof(word); break;
+					case 11: flyingHandling->fFormLift = atof(word); break;
+					case 12: flyingHandling->fAttackLift = atof(word); break;
+					case 13: flyingHandling->fMoveRes = atof(word); break;
+					case 14: flyingHandling->vecTurnRes.x = atof(word); break;
+					case 15: flyingHandling->vecTurnRes.y = atof(word); break;
+					case 16: flyingHandling->vecTurnRes.z = atof(word); break;
+					case 17: flyingHandling->vecSpeedRes.x = atof(word); break;
+					case 18: flyingHandling->vecSpeedRes.y = atof(word); break;
+					case 19: flyingHandling->vecSpeedRes.z = atof(word); break;
+					}
+					field++;
+				}
+			}else if(line[0] == '%'){
+				// Boat data
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0: break;
+					case  1:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						boatHandling = GetBoatPointer(handlingId);
+						boatHandling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  2: boatHandling->fThrustY = atof(word); break;
+					case  3: boatHandling->fThrustZ = atof(word); break;
+					case  4: boatHandling->fThrustAppZ = atof(word); break;
+					case  5: boatHandling->fAqPlaneForce = atof(word); break;
+					case  6: boatHandling->fAqPlaneLimit = atof(word); break;
+					case  7: boatHandling->fAqPlaneOffset = atof(word); break;
+					case  8: boatHandling->fWaveAudioMult = atof(word); break;
+					case  9: boatHandling->vecMoveRes.x = atof(word); break;
+					case 10: boatHandling->vecMoveRes.y = atof(word); break;
+					case 11: boatHandling->vecMoveRes.z = atof(word); break;
+					case 12: boatHandling->vecTurnRes.x = atof(word); break;
+					case 13: boatHandling->vecTurnRes.y = atof(word); break;
+					case 14: boatHandling->vecTurnRes.z = atof(word); break;
+					case 15: boatHandling->fLook_L_R_BehindCamHeight = atof(word); break;
+					}
+					field++;
+				}
+			}else{
+				field = 0;
+				strcpy(delim, " \t");
+				// FIX: game seems to use a do-while loop here
+				for(word = strtok(line, delim); word; word = strtok(nil, delim)){
+					switch(field){
+					case  0:
+						handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
+						assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
+						handling = &HandlingData[handlingId];
+						handling->nIdentifier = (eHandlingId)handlingId;
+						break;
+					case  1: handling->fMass = atof(word); break;
+					case  2: handling->Dimension.x = atof(word); break;
+					case  3: handling->Dimension.y = atof(word); break;
+					case  4: handling->Dimension.z = atof(word); break;
+					case  5: handling->CentreOfMass.x = atof(word); break;
+					case  6: handling->CentreOfMass.y = atof(word); break;
+					case  7: handling->CentreOfMass.z = atof(word); break;
+					case  8: handling->nPercentSubmerged = atoi(word); break;
+					case  9: handling->fTractionMultiplier = atof(word); break;
+					case 10: handling->fTractionLoss = atof(word); break;
+					case 11: handling->fTractionBias = atof(word); break;
+					case 12: handling->Transmission.nNumberOfGears = atoi(word); break;
+					case 13: handling->Transmission.fMaxVelocity = atof(word); break;
+					case 14: handling->Transmission.fEngineAcceleration = atof(word) * 0.4f; break;
+					case 15: handling->Transmission.nDriveType = word[0]; break;
+					case 16: handling->Transmission.nEngineType = word[0]; break;
+					case 17: handling->fBrakeDeceleration = atof(word); break;
+					case 18: handling->fBrakeBias = atof(word); break;
+					case 19: handling->bABS = !!atoi(word); break;
+					case 20: handling->fSteeringLock = atof(word); break;
+					case 21: handling->fSuspensionForceLevel = atof(word); break;
+					case 22: handling->fSuspensionDampingLevel = atof(word); break;
+					case 23: handling->fSeatOffsetDistance = atof(word); break;
+					case 24: handling->fCollisionDamageMultiplier = atof(word); break;
+					case 25: handling->nMonetaryValue = atoi(word); break;
+					case 26: handling->fSuspensionUpperLimit = atof(word); break;
+					case 27: handling->fSuspensionLowerLimit = atof(word); break;
+					case 28: handling->fSuspensionBias = atof(word); break;
+					case 29: handling->fSuspensionAntidiveMultiplier = atof(word); break;
+					case 30:
+						sscanf(word, "%x", &handling->Flags);
+						handling->Transmission.Flags = handling->Flags;
+						break;
+					case 31: handling->FrontLights = atoi(word); break;
+					case 32: handling->RearLights = atoi(word); break;
+					}
+					field++;
+				}
+				ConvertDataToGameUnits(handling);
 			}
-			ConvertDataToGameUnits(handling);
 		}
 	}
 }
@@ -253,6 +356,7 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 	if(handling->fTurnMass < 10.0f)
 		handling->fTurnMass *= 5.0f;
 	handling->fInvMass = 1.0f/handling->fMass;
+	handling->fCollisionDamageMultiplier *= 2000.0f/handling->fMass;
 	handling->fBuoyancy = 100.0f/handling->nPercentSubmerged * 0.008f*handling->fMass;
 
 	// What the hell is going on here?
@@ -268,11 +372,16 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 
 	if(handling->nIdentifier == HANDLING_RCBANDIT){
 		handling->Transmission.fUnkMaxVelocity = handling->Transmission.fMaxVelocity;
+		handling->Transmission.fMaxReverseVelocity = -handling->Transmission.fMaxVelocity;
+	}else if(handling->nIdentifier >= HANDLING_BIKE && handling->nIdentifier <= HANDLING_FREEWAY){
+		handling->Transmission.fUnkMaxVelocity = velocity;
+		handling->Transmission.fMaxVelocity = velocity * 1.2f;
+		handling->Transmission.fMaxReverseVelocity = -0.05f;
 	}else{
 		handling->Transmission.fUnkMaxVelocity = velocity;
 		handling->Transmission.fMaxVelocity = velocity * 1.2f;
+		handling->Transmission.fMaxReverseVelocity = -0.2f;
 	}
-	handling->Transmission.fMaxReverseVelocity = -0.2f;
 
 	if(handling->Transmission.nDriveType == '4')
 		handling->Transmission.fEngineAcceleration /= 4.0f;
@@ -282,6 +391,15 @@ cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 	handling->Transmission.InitGearRatios();
 }
 
+void
+cHandlingDataMgr::ConvertBikeDataToGameUnits(tBikeHandlingData *handling)
+{
+	handling->fMaxLean = Sin(DEGTORAD(handling->fMaxLean));
+	handling->fFullAnimLean = DEGTORAD(handling->fFullAnimLean);
+	handling->fWheelieAng = Sin(DEGTORAD(handling->fWheelieAng));
+	handling->fStoppieAng = Sin(DEGTORAD(handling->fStoppieAng));
+}
+
 int32
 cHandlingDataMgr::GetHandlingId(const char *name)
 {
@@ -291,3 +409,19 @@ cHandlingDataMgr::GetHandlingId(const char *name)
 			break;
 	return i;
 }
+
+tFlyingHandlingData*
+cHandlingDataMgr::GetFlyingPointer(uint8 id)
+{
+	if(id >= HANDLING_SEAPLANE && id <= HANDLING_RCCOPTER)
+		return &FlyingHandlingData[id-HANDLING_SEAPLANE];
+	return &FlyingHandlingData[0];
+}
+
+tBoatHandlingData*
+cHandlingDataMgr::GetBoatPointer(uint8 id)
+{
+	if(id >= HANDLING_PREDATOR && id <= HANDLING_SEAPLANE)
+		return &BoatHandlingData[id-HANDLING_PREDATOR];
+	return &BoatHandlingData[0];
+}