From 47db30f1d703ee90ba38cae1bfe070b4cae490e4 Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Wed, 8 Jul 2020 09:50:47 -0300 Subject: [PATCH] Use CoordsXYZ on vehicle_create_train --- src/openrct2/ride/Ride.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 82b7c04ba6..524f3b878d 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4516,8 +4516,7 @@ static Vehicle* vehicle_create_car( * rct2: 0x006DD84C */ static train_ref vehicle_create_train( - ride_id_t rideIndex, int32_t x, int32_t y, int32_t z, int32_t vehicleIndex, int32_t* remainingDistance, - TileElement* tileElement) + ride_id_t rideIndex, const CoordsXYZ& trainPos, int32_t vehicleIndex, int32_t* remainingDistance, TileElement* tileElement) { train_ref train = { nullptr, nullptr }; auto ride = get_ride(rideIndex); @@ -4526,8 +4525,7 @@ static train_ref vehicle_create_train( for (int32_t carIndex = 0; carIndex < ride->num_cars_per_train; carIndex++) { auto vehicle = ride_entry_get_vehicle_at_position(ride->subtype, ride->num_cars_per_train, carIndex); - auto car = vehicle_create_car( - rideIndex, vehicle, carIndex, vehicleIndex, { x, y, z }, remainingDistance, tileElement); + auto car = vehicle_create_car(rideIndex, vehicle, carIndex, vehicleIndex, trainPos, remainingDistance, tileElement); if (car == nullptr) break; @@ -4564,7 +4562,7 @@ static void vehicle_create_trains(ride_id_t rideIndex, int32_t x, int32_t y, int { remainingDistance = 0; } - train_ref train = vehicle_create_train(rideIndex, x, y, z, vehicleIndex, &remainingDistance, tileElement); + train_ref train = vehicle_create_train(rideIndex, { x, y, z }, vehicleIndex, &remainingDistance, tileElement); if (vehicleIndex == 0) { firstTrain = train;