From 5f81eb88299bb49c4efafc300cc48940bda94ba9 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Fri, 12 Dec 2025 13:11:19 +0100
Subject: [PATCH] Rename members of GForces

---
 src/openrct2/ride/Ride.cpp         | 12 +++++-----
 src/openrct2/ride/Vehicle.cpp      | 38 +++++++++++++++---------------
 src/openrct2/ride/Vehicle.h        |  4 ++--
 src/openrct2/scripting/Duktape.hpp |  4 ++--
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index e22279f90a..02b7c035f8 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -2059,17 +2059,17 @@ static void RideMeasurementUpdate(Ride& ride, RideMeasurement& measurement)
     if (measurement.flags & RIDE_MEASUREMENT_FLAG_G_FORCES)
     {
         auto gForces = vehicle->GetGForces();
-        gForces.VerticalG = std::clamp(gForces.VerticalG / 8, -127, 127);
-        gForces.LateralG = std::clamp(gForces.LateralG / 8, -127, 127);
+        gForces.verticalG = std::clamp(gForces.verticalG / 8, -127, 127);
+        gForces.lateralG = std::clamp(gForces.lateralG / 8, -127, 127);
 
         if (currentTicks & 1)
         {
-            gForces.VerticalG = (gForces.VerticalG + measurement.vertical[measurement.current_item]) / 2;
-            gForces.LateralG = (gForces.LateralG + measurement.lateral[measurement.current_item]) / 2;
+            gForces.verticalG = (gForces.verticalG + measurement.vertical[measurement.current_item]) / 2;
+            gForces.lateralG = (gForces.lateralG + measurement.lateral[measurement.current_item]) / 2;
         }
 
-        measurement.vertical[measurement.current_item] = gForces.VerticalG & 0xFF;
-        measurement.lateral[measurement.current_item] = gForces.LateralG & 0xFF;
+        measurement.vertical[measurement.current_item] = gForces.verticalG & 0xFF;
+        measurement.lateral[measurement.current_item] = gForces.lateralG & 0xFF;
     }
 
     auto velocity = std::min(std::abs((vehicle->velocity * 5) >> 16), 255);
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index f54daf324f..58ec4478c0 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -580,26 +580,26 @@ void Vehicle::UpdateMeasurements()
         if (curRide->getRideTypeDescriptor().HasFlag(RtdFlag::hasGForces))
         {
             auto gForces = GetGForces();
-            gForces.VerticalG += curRide->previousVerticalG;
-            gForces.LateralG += curRide->previousLateralG;
-            gForces.VerticalG /= 2;
-            gForces.LateralG /= 2;
+            gForces.verticalG += curRide->previousVerticalG;
+            gForces.lateralG += curRide->previousLateralG;
+            gForces.verticalG /= 2;
+            gForces.lateralG /= 2;
 
-            curRide->previousVerticalG = gForces.VerticalG;
-            curRide->previousLateralG = gForces.LateralG;
-            if (gForces.VerticalG <= 0)
+            curRide->previousVerticalG = gForces.verticalG;
+            curRide->previousLateralG = gForces.lateralG;
+            if (gForces.verticalG <= 0)
             {
                 curRide->totalAirTime++;
             }
 
-            if (gForces.VerticalG > curRide->maxPositiveVerticalG)
-                curRide->maxPositiveVerticalG = gForces.VerticalG;
+            if (gForces.verticalG > curRide->maxPositiveVerticalG)
+                curRide->maxPositiveVerticalG = gForces.verticalG;
 
-            if (gForces.VerticalG < curRide->maxNegativeVerticalG)
-                curRide->maxNegativeVerticalG = gForces.VerticalG;
+            if (gForces.verticalG < curRide->maxNegativeVerticalG)
+                curRide->maxNegativeVerticalG = gForces.verticalG;
 
-            gForces.LateralG = std::abs(gForces.LateralG);
-            curRide->maxLateralG = std::max(curRide->maxLateralG, static_cast<fixed16_2dp>(gForces.LateralG));
+            gForces.lateralG = std::abs(gForces.lateralG);
+            curRide->maxLateralG = std::max(curRide->maxLateralG, static_cast<fixed16_2dp>(gForces.lateralG));
         }
     }
 
@@ -5102,17 +5102,17 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const
         if (!IsOnCoveredTrack())
         {
             auto gForces = GetGForces();
-            gForces.LateralG = std::abs(gForces.LateralG);
-            if (gForces.LateralG <= 150)
+            gForces.lateralG = std::abs(gForces.lateralG);
+            if (gForces.lateralG <= 150)
             {
                 if (Geometry::getAccelerationFromPitch(pitch) < 0)
                 {
-                    if (gForces.VerticalG > -40)
+                    if (gForces.verticalG > -40)
                     {
                         return;
                     }
                 }
-                else if (gForces.VerticalG > -80)
+                else if (gForces.verticalG > -80)
                 {
                     return;
                 }
@@ -5133,14 +5133,14 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const
 
             if (Geometry::getAccelerationFromPitch(pitch) < 0)
             {
-                if (gForces.VerticalG > -45)
+                if (gForces.verticalG > -45)
                 {
                     return;
                 }
             }
             else
             {
-                if (gForces.VerticalG > -80)
+                if (gForces.verticalG > -80)
                 {
                     return;
                 }
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index 6ba4528ce1..6cc6e3bd31 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -29,8 +29,8 @@ struct PaintSession;
 
 struct GForces
 {
-    int32_t VerticalG{};
-    int32_t LateralG{};
+    int32_t verticalG{};
+    int32_t lateralG{};
 };
 
 // Size: 0x09
diff --git a/src/openrct2/scripting/Duktape.hpp b/src/openrct2/scripting/Duktape.hpp
index ed3a8903d4..3dadf3eeba 100644
--- a/src/openrct2/scripting/Duktape.hpp
+++ b/src/openrct2/scripting/Duktape.hpp
@@ -442,8 +442,8 @@ namespace OpenRCT2::Scripting
     inline DukValue ToDuk(duk_context* ctx, const GForces& value)
     {
         DukObject dukGForces(ctx);
-        dukGForces.Set("lateralG", value.LateralG);
-        dukGForces.Set("verticalG", value.VerticalG);
+        dukGForces.Set("lateralG", value.lateralG);
+        dukGForces.Set("verticalG", value.verticalG);
         return dukGForces.Take();
     }