mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #9473: vehicle_update_departing_boat_hire to Vehicle::UpdateDepartingBoatHire

This commit is contained in:
hdpoliveira 2020-04-10 04:50:18 -03:00
parent b69b434c1e
commit 886901b873
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/ride/Vehicle.cpp
View File

@ -3136,19 +3136,19 @@ static void vehicle_update_travelling_boat_hire_setup(Vehicle* vehicle)
*
* rct2: 0x006D982F
*/
static void vehicle_update_departing_boat_hire(Vehicle* vehicle)
void Vehicle::UpdateDepartingBoatHire()
{
vehicle->lost_time_out = 0;
lost_time_out = 0;
auto ride = get_ride(vehicle->ride);
if (ride == nullptr)
auto curRide = get_ride(ride);
if (curRide == nullptr)
return;
ride->stations[vehicle->current_station].Depart &= STATION_DEPART_FLAG;
uint8_t waitingTime = std::max(ride->min_waiting_time, static_cast<uint8_t>(3));
curRide->stations[current_station].Depart &= STATION_DEPART_FLAG;
uint8_t waitingTime = std::max(curRide->min_waiting_time, static_cast<uint8_t>(3));
waitingTime = std::min(waitingTime, static_cast<uint8_t>(127));
ride->stations[vehicle->current_station].Depart |= waitingTime;
vehicle_update_travelling_boat_hire_setup(vehicle);
curRide->stations[current_station].Depart |= waitingTime;
vehicle_update_travelling_boat_hire_setup(this);
}
/**
@ -3282,7 +3282,7 @@ void Vehicle::UpdateDeparting()
{
if (curRide->mode == RIDE_MODE_BOAT_HIRE)
{
vehicle_update_departing_boat_hire(this);
UpdateDepartingBoatHire();
return;
}
else if (curRide->mode == RIDE_MODE_REVERSE_INCLINE_LAUNCHED_SHUTTLE)

1
src/openrct2/ride/Vehicle.h
View File

@ -326,6 +326,7 @@ private:
void UpdateTravellingCableLift();
void UpdateTravellingBoat();
void UpdateMotionBoatHire();
void UpdateDepartingBoatHire();
void UpdateArriving();
void UpdateUnloadingPassengers();
void UpdateWaitingForCableLift();