From 886901b873dc86ca7c5c826443320225edb516fe Mon Sep 17 00:00:00 2001
From: hdpoliveira <hdpoliveira@gmail.com>
Date: Fri, 10 Apr 2020 04:50:18 -0300
Subject: [PATCH] Part of #9473: vehicle_update_departing_boat_hire to
 Vehicle::UpdateDepartingBoatHire

---
 src/openrct2/ride/Vehicle.cpp | 18 +++++++++---------
 src/openrct2/ride/Vehicle.h   |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index f419eef1cb..dafaa7f75d 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -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)
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index fd04a90f88..351ab2ce6b 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -326,6 +326,7 @@ private:
     void UpdateTravellingCableLift();
     void UpdateTravellingBoat();
     void UpdateMotionBoatHire();
+    void UpdateDepartingBoatHire();
     void UpdateArriving();
     void UpdateUnloadingPassengers();
     void UpdateWaitingForCableLift();