From a4f7ca4682c41c044765d183fcc2d54fd3876726 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Sat, 17 Dec 2022 17:16:34 +0100
Subject: [PATCH] Refactor ride_construct() to RideConstructionStart()

---
 src/openrct2-ui/interface/ViewportInteraction.cpp | 2 +-
 src/openrct2-ui/ride/Construction.cpp             | 3 ++-
 src/openrct2-ui/windows/Ride.cpp                  | 2 +-
 src/openrct2/ride/Ride.h                          | 1 -
 src/openrct2/ride/RideConstruction.cpp            | 8 ++++----
 src/openrct2/ride/RideConstruction.h              | 2 ++
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index e0683f44ae..19d2272f91 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -559,7 +559,7 @@ bool ViewportInteractionRightClick(const ScreenCoordsXY& screenCoords)
                 auto ride = get_ride(vehicle->ride);
                 if (ride != nullptr)
                 {
-                    ride_construct(ride);
+                    RideConstructionStart(*ride);
                 }
             }
         }
diff --git a/src/openrct2-ui/ride/Construction.cpp b/src/openrct2-ui/ride/Construction.cpp
index 2de17ef496..dcd5e74052 100644
--- a/src/openrct2-ui/ride/Construction.cpp
+++ b/src/openrct2-ui/ride/Construction.cpp
@@ -11,6 +11,7 @@
 
 #include <openrct2/actions/RideCreateAction.h>
 #include <openrct2/ride/Ride.h>
+#include <openrct2/ride/RideConstruction.h>
 #include <openrct2/ride/RideTypes.h>
 
 /**
@@ -30,7 +31,7 @@ void ride_construct_new(RideSelection listItem)
             return;
         const auto rideIndex = result->GetData<RideId>();
         auto ride = get_ride(rideIndex);
-        ride_construct(ride);
+        RideConstructionStart(*ride);
     });
 
     GameActions::Execute(&gameAction);
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 35fd148cdf..cf969e6e2a 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -1639,7 +1639,7 @@ static void WindowRideMainMouseup(rct_window* w, WidgetIndex widgetIndex)
             auto ride = get_ride(w->rideId);
             if (ride != nullptr)
             {
-                ride_construct(ride);
+                RideConstructionStart(*ride);
                 if (window_find_by_number(WindowClass::RideConstruction, ride->id.ToUnderlying()) != nullptr)
                 {
                     window_close(*w);
diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index b6a5819fda..bb8441dd53 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -1011,7 +1011,6 @@ void ride_update_favourited_stat();
 void ride_check_all_reachable();
 
 bool ride_try_get_origin_element(const Ride* ride, CoordsXYE* output);
-void ride_construct(Ride* ride);
 void ride_clear_blocked_tiles(Ride* ride);
 Staff* ride_get_mechanic(Ride* ride);
 Staff* ride_get_assigned_mechanic(Ride* ride);
diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp
index b9bb4099db..e227efe599 100644
--- a/src/openrct2/ride/RideConstruction.cpp
+++ b/src/openrct2/ride/RideConstruction.cpp
@@ -130,12 +130,12 @@ static rct_window* ride_create_or_find_construction_window(RideId rideIndex)
  *
  *  rct2: 0x006B4857
  */
-void ride_construct(Ride* ride)
+void RideConstructionStart(Ride& ride)
 {
     CoordsXYE trackElement;
-    if (ride_try_get_origin_element(ride, &trackElement))
+    if (ride_try_get_origin_element(&ride, &trackElement))
     {
-        ride->FindTrackGap(trackElement, &trackElement);
+        ride.FindTrackGap(trackElement, &trackElement);
 
         rct_window* w = window_get_main();
         if (w != nullptr && ride_modify(trackElement))
@@ -143,7 +143,7 @@ void ride_construct(Ride* ride)
     }
     else
     {
-        ride_initialise_construction_window(ride);
+        ride_initialise_construction_window(&ride);
     }
 }
 
diff --git a/src/openrct2/ride/RideConstruction.h b/src/openrct2/ride/RideConstruction.h
index 731616754e..0802aa45f9 100644
--- a/src/openrct2/ride/RideConstruction.h
+++ b/src/openrct2/ride/RideConstruction.h
@@ -92,3 +92,5 @@ CoordsXYZD ride_get_entrance_or_exit_position_from_screen_position(const ScreenC
 
 bool ride_select_backwards_from_front();
 bool ride_select_forwards_from_back();
+
+void RideConstructionStart(Ride& ride);