From bd9cf4ceaa8421ded6d565a9f9b58cf09a4a03d1 Mon Sep 17 00:00:00 2001
From: Tulio Leao <tupaschoal@gmail.com>
Date: Wed, 8 Jul 2020 14:15:33 -0300
Subject: [PATCH] Rename RideRatingCalculationData::NumOf.. to AmounfOf

---
 src/openrct2/rct2/S6Exporter.cpp  |  4 ++--
 src/openrct2/rct2/S6Importer.cpp  |  4 ++--
 src/openrct2/ride/RideRatings.cpp | 16 ++++++++--------
 src/openrct2/ride/RideRatings.h   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index b505ee1667..ae35d2d8bf 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -787,8 +787,8 @@ void S6Exporter::ExportRideRatingsCalcData()
     {
         dst.proximity_scores[i] = src.ProximityScores[i];
     }
-    dst.num_brakes = src.NumBrakes;
-    dst.num_reversers = src.NumReversers;
+    dst.num_brakes = src.AmountOfBrakes;
+    dst.num_reversers = src.AmountOfReversers;
     dst.station_flags = src.StationFlags;
 }
 
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 2bc047a17e..38aa04da81 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -807,8 +807,8 @@ public:
         {
             dst.ProximityScores[i] = src.proximity_scores[i];
         }
-        dst.NumBrakes = src.num_brakes;
-        dst.NumReversers = src.num_reversers;
+        dst.AmountOfBrakes = src.num_brakes;
+        dst.AmountOfReversers = src.num_reversers;
         dst.StationFlags = src.station_flags;
     }
 
diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp
index 6ac6a15e61..e19c3240ad 100644
--- a/src/openrct2/ride/RideRatings.cpp
+++ b/src/openrct2/ride/RideRatings.cpp
@@ -181,8 +181,8 @@ static void ride_ratings_update_state_1()
     {
         gRideRatingsCalcData.ProximityScores[i] = 0;
     }
-    gRideRatingsCalcData.NumBrakes = 0;
-    gRideRatingsCalcData.NumReversers = 0;
+    gRideRatingsCalcData.AmountOfBrakes = 0;
+    gRideRatingsCalcData.AmountOfReversers = 0;
     gRideRatingsCalcData.State = RIDE_RATINGS_STATE_2;
     gRideRatingsCalcData.StationFlags = 0;
     ride_ratings_begin_proximity_loop();
@@ -710,11 +710,11 @@ static void ride_ratings_score_close_proximity(TileElement* inputTileElement)
     switch (gRideRatingsCalcData.ProximityTrackType)
     {
         case TRACK_ELEM_BRAKES:
-            gRideRatingsCalcData.NumBrakes++;
+            gRideRatingsCalcData.AmountOfBrakes++;
             break;
         case TRACK_ELEM_LEFT_REVERSER:
         case TRACK_ELEM_RIGHT_REVERSER:
-            gRideRatingsCalcData.NumReversers++;
+            gRideRatingsCalcData.AmountOfReversers++;
             break;
     }
 }
@@ -902,10 +902,10 @@ static uint16_t ride_compute_upkeep(Ride* ride)
     {
         reverserMaintenanceCost = 10;
     }
-    upkeep += reverserMaintenanceCost * gRideRatingsCalcData.NumReversers;
+    upkeep += reverserMaintenanceCost * gRideRatingsCalcData.AmountOfReversers;
 
     // Add maintenance cost for brake track pieces
-    upkeep += 20 * gRideRatingsCalcData.NumBrakes;
+    upkeep += 20 * gRideRatingsCalcData.AmountOfBrakes;
 
     // these seem to be adhoc adjustments to a ride's upkeep/cost, times
     // various variables set on the ride itself.
@@ -3369,7 +3369,7 @@ void ride_ratings_calculate_reverser_roller_coaster(Ride* ride)
     ride_ratings_apply_max_speed(&ratings, ride, 44281, 88562, 35424);
     ride_ratings_apply_average_speed(&ratings, ride, 364088, 655360);
 
-    int32_t numReversers = std::min<uint16_t>(gRideRatingsCalcData.NumReversers, 6);
+    int32_t numReversers = std::min<uint16_t>(gRideRatingsCalcData.AmountOfReversers, 6);
     ride_rating reverserRating = numReversers * RIDE_RATING(0, 20);
     ride_ratings_add(&ratings, reverserRating, reverserRating, reverserRating);
 
@@ -3381,7 +3381,7 @@ void ride_ratings_calculate_reverser_roller_coaster(Ride* ride)
     ride_ratings_apply_proximity(&ratings, 22367);
     ride_ratings_apply_scenery(&ratings, ride, 11155);
 
-    if (gRideRatingsCalcData.NumReversers < 1)
+    if (gRideRatingsCalcData.AmountOfReversers < 1)
     {
         ratings.Excitement /= 8;
     }
diff --git a/src/openrct2/ride/RideRatings.h b/src/openrct2/ride/RideRatings.h
index 96be201388..641815dd1c 100644
--- a/src/openrct2/ride/RideRatings.h
+++ b/src/openrct2/ride/RideRatings.h
@@ -48,8 +48,8 @@ struct RideRatingCalculationData
     uint8_t ProximityBaseHeight;
     uint16_t ProximityTotal;
     uint16_t ProximityScores[26];
-    uint16_t NumBrakes;
-    uint16_t NumReversers;
+    uint16_t AmountOfBrakes;
+    uint16_t AmountOfReversers;
     uint16_t StationFlags;
 };