mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix #3126. Go Karts now correctly choose lanes.

Browse Source 
Issue caused by mistake in implementation. Old version could use the variable ride->num_vehicles but in the new version this variable is not incremented each loop so vehicleIndex has to be passed into the vehicle creation functions
This commit is contained in:
duncanspumpkin
2016-03-13 18:07:10 +00:00
parent 21e22a2747
commit a3efbad2ba
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ride/ride.c
View File

@@ -4289,6 +4289,7 @@ rct_vehicle *vehicle_create_car(
int rideIndex,
int vehicleEntryIndex,
int carIndex,
int vehicleIndex,
int x,
int y,
int z,
@@ -4384,8 +4385,9 @@ rct_vehicle *vehicle_create_car(
}
if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_14) {
// Choose which lane Go Kart should start in
regs.dl = 5;
if (!(ride->num_vehicles & 1)) {
if (vehicleIndex & 1) {
regs.dl = 6;
}
}
@@ -4461,7 +4463,7 @@ rct_vehicle *vehicle_create_car(
*
* rct2: 0x006DD84C
*/
train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int *remainingDistance, rct_map_element *mapElement)
train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int vehicleIndex, int *remainingDistance, rct_map_element *mapElement)
{
rct_ride *ride = get_ride(rideIndex);
@@ -4470,7 +4472,7 @@ train_ref vehicle_create_train(int rideIndex, int x, int y, int z, int *remainin
train_ref train = { NULL, NULL };
for (int carIndex = 0; carIndex < ride->num_cars_per_train; carIndex++) {
rct_vehicle *car = vehicle_create_car(rideIndex, trainLayout[carIndex], carIndex, x, y, z, remainingDistance, mapElement);
rct_vehicle *car = vehicle_create_car(rideIndex, trainLayout[carIndex], carIndex, vehicleIndex, x, y, z, remainingDistance, mapElement);
if (carIndex == 0) {
train.head = car;
} else {
@@ -4494,7 +4496,7 @@ void vehicle_create_trains(int rideIndex, int x, int y, int z, rct_map_element *
if (ride_is_block_sectioned(ride)) {
remainingDistance = 0;
}
train_ref train = vehicle_create_train(rideIndex, x, y, z, &remainingDistance, mapElement);
train_ref train = vehicle_create_train(rideIndex, x, y, z, vehicleIndex, &remainingDistance, mapElement);
if (vehicleIndex == 0) {
firstTrain = train;
} else {