From cbbc4edd20907ea054cceeb39bbda37ec8a23ef8 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sun, 4 Oct 2015 21:39:02 +0100
Subject: [PATCH] Fix #1720. Ride train count misscalculation.

Should now correctly allow more trains when car length reduced
---
 src/ride/ride.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ride/ride.c b/src/ride/ride.c
index 6f87ce8c8e..516df6ead1 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -6396,7 +6396,9 @@ void ride_update_max_vehicles(int rideIndex)
 				break;
 			}
 		}
+		int newCarsPerTrain = max(ride->var_0CB, rideEntry->min_cars_in_train);
 		maxCarsPerTrain = max(maxCarsPerTrain, rideEntry->min_cars_in_train);
+		newCarsPerTrain = min(maxCarsPerTrain, newCarsPerTrain);
 		ride->min_max_cars_per_train = maxCarsPerTrain | (rideEntry->min_cars_in_train << 4);
 
 		switch (ride->mode) {
@@ -6413,15 +6415,15 @@ void ride_update_max_vehicles(int rideIndex)
 			break;
 		default:
 			// Calculate maximum number of trains
-			ride_entry_get_train_layout(ride->subtype, maxCarsPerTrain, trainLayout);
+			ride_entry_get_train_layout(ride->subtype, newCarsPerTrain, trainLayout);
 			trainLength = 0;
-			for (int i = 0; i < maxCarsPerTrain; i++) {
+			for (int i = 0; i < newCarsPerTrain; i++) {
 				vehicleEntry = &rideEntry->vehicles[trainLayout[i]];
 				trainLength += vehicleEntry->var_04;
 			}
 
 			int totalLength = trainLength / 2;
-			if (maxCarsPerTrain != 1)
+			if (newCarsPerTrain != 1)
 				totalLength /= 2;
 
 			maxNumTrains = 0;
@@ -6436,12 +6438,12 @@ void ride_update_max_vehicles(int rideIndex)
 			) {
 				maxNumTrains = min(maxNumTrains, 31);
 			} else {
-				ride_entry_get_train_layout(ride->subtype, maxCarsPerTrain, trainLayout);
+				ride_entry_get_train_layout(ride->subtype, newCarsPerTrain, trainLayout);
 				vehicleEntry = &rideEntry->vehicles[trainLayout[0]];
 				int unk = vehicleEntry->var_5C;
 
 				int totalSpacing = 0;
-				for (int i = 0; i < maxCarsPerTrain; i++) {
+				for (int i = 0; i < newCarsPerTrain; i++) {
 					vehicleEntry = &rideEntry->vehicles[trainLayout[i]];
 					totalSpacing += vehicleEntry->var_04;
 				}
@@ -6463,7 +6465,7 @@ void ride_update_max_vehicles(int rideIndex)
 		}
 		ride->max_trains = maxNumTrains;
 
-		numCarsPerTrain = min(ride->var_0CB, maxCarsPerTrain);
+		numCarsPerTrain = min(ride->var_0CB, newCarsPerTrain);
 		numVehicles = min(ride->var_0CA, maxNumTrains);
 	} else {
 		ride->max_trains = rideEntry->cars_per_flat_ride;