From b1b103b96126abae87ca1c56a2f18d0195c6387b Mon Sep 17 00:00:00 2001 From: Tulio Leao Date: Mon, 4 May 2020 22:39:14 -0300 Subject: [PATCH] Add missing 'y' in "TrainReadyToDepart" (#11636) --- src/openrct2/ride/Vehicle.cpp | 18 +++++++++--------- src/openrct2/ride/Vehicle.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index b1e2f57336..e4126b584a 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -2211,7 +2211,7 @@ void Vehicle::UpdateMovingToEndOfStation() * * rct2: 0x006D7FB4 */ -void Vehicle::TrainReadToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats) +void Vehicle::TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats) { if (num_peeps_on_train != num_used_seats) return; @@ -2351,7 +2351,7 @@ void Vehicle::UpdateWaitingForPassengers() { if (time_waiting < 20) { - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } } @@ -2359,7 +2359,7 @@ void Vehicle::UpdateWaitingForPassengers() { if (num_peeps_on_train == 0) { - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } } @@ -2370,7 +2370,7 @@ void Vehicle::UpdateWaitingForPassengers() { if (curRide->min_waiting_time * 32 > time_waiting) { - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } } @@ -2379,7 +2379,7 @@ void Vehicle::UpdateWaitingForPassengers() if (curRide->max_waiting_time * 32 < time_waiting) { update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } } @@ -2403,7 +2403,7 @@ void Vehicle::UpdateWaitingForPassengers() if (train->current_station == current_station) { update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } } @@ -2416,7 +2416,7 @@ void Vehicle::UpdateWaitingForPassengers() if (num_peeps_on_train == num_seats_on_train) { update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } @@ -2434,12 +2434,12 @@ void Vehicle::UpdateWaitingForPassengers() if (num_peeps_on_train >= peepTarget) update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } update_flags |= VEHICLE_UPDATE_FLAG_TRAIN_READY_DEPART; - TrainReadToDepart(num_peeps_on_train, num_used_seats_on_train); + TrainReadyToDepart(num_peeps_on_train, num_used_seats_on_train); return; } diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index ef2dabdd2b..31c64960d1 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -387,7 +387,7 @@ private: void CrashOnWater(); void CrashOnLand(); void SimulateCrash() const; - void TrainReadToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats); + void TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats); }; struct train_ref