From 0f90b2c3530d996aa8a744aac9737d49cd5fca8a Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Tue, 24 Dec 2019 11:46:56 +0000
Subject: [PATCH] Rename variable as its technically new

---
 src/openrct2/rct1/S4Importer.cpp | 4 ++--
 src/openrct2/rct2/S6Exporter.cpp | 8 ++++----
 src/openrct2/rct2/S6Importer.cpp | 4 ++--
 src/openrct2/ride/Ride.h         | 2 +-
 src/openrct2/ride/Vehicle.cpp    | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index edeed7d11a..53a8870634 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -964,11 +964,11 @@ private:
 
         if (src->cur_test_track_location.isNull())
         {
-            dst->cur_test_track_location.setNull();
+            dst->CurTestTrackLocation.setNull();
         }
         else
         {
-            dst->cur_test_track_location = { src->cur_test_track_location.x, src->cur_test_track_location.y,
+            dst->CurTestTrackLocation = { src->cur_test_track_location.x, src->cur_test_track_location.y,
                                              src->cur_test_track_z / 2 };
         }
         dst->testing_flags = src->testing_flags;
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index 9181a34cd9..9e609636bb 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -610,15 +610,15 @@ void S6Exporter::ExportRide(rct2_ride* dst, const Ride* src)
     // pad_106[0x2];
     dst->testing_flags = src->testing_flags;
 
-    if (src->cur_test_track_location.isNull())
+    if (src->CurTestTrackLocation.isNull())
     {
         dst->cur_test_track_location.setNull();
     }
     else
     {
-        dst->cur_test_track_location = { static_cast<uint8_t>(src->cur_test_track_location.x),
-                                         static_cast<uint8_t>(src->cur_test_track_location.y) };
-        dst->cur_test_track_z = static_cast<uint8_t>(src->cur_test_track_location.z);
+        dst->cur_test_track_location = { static_cast<uint8_t>(src->CurTestTrackLocation.x),
+                                         static_cast<uint8_t>(src->CurTestTrackLocation.y) };
+        dst->cur_test_track_z = static_cast<uint8_t>(src->CurTestTrackLocation.z);
     }
 
     dst->turn_count_default = src->turn_count_default;
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 35653d23b2..37b27f6ac2 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -617,11 +617,11 @@ public:
 
         if (src->cur_test_track_location.isNull())
         {
-            dst->cur_test_track_location.setNull();
+            dst->CurTestTrackLocation.setNull();
         }
         else
         {
-            dst->cur_test_track_location = { src->cur_test_track_location.x, src->cur_test_track_location.y,
+            dst->CurTestTrackLocation = { src->cur_test_track_location.x, src->cur_test_track_location.y,
                                              src->cur_test_track_z };
         }
 
diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index a23bb3ade5..8930b65def 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -266,7 +266,7 @@ struct Ride
     uint32_t testing_flags;
     // x y z map location of the current track piece during a test
     // this is to prevent counting special tracks multiple times
-    TileCoordsXYZ cur_test_track_location;
+    TileCoordsXYZ CurTestTrackLocation;
     // Next 3 variables are related (XXXX XYYY ZZZa aaaa)
     uint16_t turn_count_default; // X = current turn count
     uint16_t turn_count_banked;
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 08b47ae6d1..7e1c04e14c 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -1595,9 +1595,9 @@ static void vehicle_update_measurements(rct_vehicle* vehicle)
 
     // If we have already evaluated this track piece skip to next section
     TileCoordsXYZ curTrackLoc{ CoordsXYZ{ vehicle->track_x, vehicle->track_y, vehicle->track_z } };
-    if (curTrackLoc != ride->cur_test_track_location)
+    if (curTrackLoc != ride->CurTestTrackLocation)
     {
-        ride->cur_test_track_location = curTrackLoc;
+        ride->CurTestTrackLocation = curTrackLoc;
 
         if (ride_get_entrance_location(ride, ride->current_test_station).isNull())
             return;
@@ -3073,7 +3073,7 @@ void vehicle_test_reset(rct_vehicle* vehicle)
     ride->previous_vertical_g = 0;
     ride->previous_lateral_g = 0;
     ride->testing_flags = 0;
-    ride->cur_test_track_location.setNull();
+    ride->CurTestTrackLocation.setNull();
     ride->turn_count_default = 0;
     ride->turn_count_banked = 0;
     ride->turn_count_sloped = 0;