From 1db2a4986f5d8d7bd8a45cbbeba8428ddc85c6b0 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 23 Jul 2017 13:24:15 +0100
Subject: [PATCH] Rename gTotalRideValue to gTotalRideValueForMoney

---
 src/openrct2/scenario/Scenario.cpp | 4 ++--
 src/openrct2/world/Park.cpp        | 5 ++---
 src/openrct2/world/Park.h          | 9 +++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp
index 542178f3e4..3194095415 100644
--- a/src/openrct2/scenario/Scenario.cpp
+++ b/src/openrct2/scenario/Scenario.cpp
@@ -250,8 +250,8 @@ void scenario_success_submit_name(const char *name)
 static void scenario_entrance_fee_too_high_check()
 {
     uint16 x = 0, y = 0;
-    money16 totalRideValue = gTotalRideValueForMoney;
-    money16 max_fee = totalRideValue + (totalRideValue / 2);
+    money16 totalRideValueForMoney = gTotalRideValueForMoney;
+    money16 max_fee = totalRideValueForMoney + (totalRideValueForMoney / 2);
 
     if ((gParkFlags & PARK_FLAGS_PARK_OPEN) && park_get_entrance_fee() > max_fee) {
         for (sint32 i = 0; i < MAX_PARK_ENTRANCES && gParkEntrances[i].x != LOCATION_NULL; i++) {
diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp
index 0b7bfc1a4d..cdeba36019 100644
--- a/src/openrct2/world/Park.cpp
+++ b/src/openrct2/world/Park.cpp
@@ -599,7 +599,7 @@ void Park::Update()
         gParkRating = CalculateParkRating();
         gParkValue = CalculateParkValue();
         gCompanyValue = CalculateCompanyValue();
-        gTotalRideValueForMoney = CalculateTotalRideValue();
+        gTotalRideValueForMoney = CalculateTotalRideValueForMoney();
         _suggestedGuestMaximum = CalculateSuggestedMaxGuests();
         _guestGenerationProbability = CalculateGuestGenerationProbability();
 
@@ -787,7 +787,6 @@ money32 Park::CalculateRideValue(const Ride * ride) const
     if (ride->type != RIDE_TYPE_NULL &&
         ride->value != RIDE_VALUE_UNDEFINED)
     {
-        // Fair value * (...)
         result = (ride->value * 10) * (ride_customers_in_last_5_minutes(ride) + rideBonusValue[ride->type] * 4);
     }
     return result;
@@ -798,7 +797,7 @@ money32 Park::CalculateCompanyValue() const
     return finance_get_current_cash() + gParkValue - gBankLoan;
 }
 
-money16 Park::CalculateTotalRideValue() const
+money16 Park::CalculateTotalRideValueForMoney() const
 {
     money16 totalRideValue = 0;
     sint32 i;
diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h
index 3d2cee926a..d91151ed7b 100644
--- a/src/openrct2/world/Park.h
+++ b/src/openrct2/world/Park.h
@@ -74,9 +74,6 @@ namespace OpenRCT2
         sint32          CalculateParkRating() const;
         money32         CalculateParkValue() const;
         money32         CalculateCompanyValue() const;
-        money16         CalculateTotalRideValue() const;
-        uint32          CalculateSuggestedMaxGuests() const;
-        uint32          CalculateGuestGenerationProbability() const;
         static uint8    CalculateGuestInitialHappiness(uint8 percentage);
 
         rct_peep *  GenerateGuest();
@@ -85,10 +82,14 @@ namespace OpenRCT2
         void UpdateHistories();
 
     private:
-        money32 CalculateRideValue(const Ride * ride) const;
+        money32     CalculateRideValue(const Ride * ride) const;
+        money16     CalculateTotalRideValueForMoney() const;
+        uint32      CalculateSuggestedMaxGuests() const;
+        uint32      CalculateGuestGenerationProbability() const;
 
         void        GenerateGuests();
         rct_peep *  GenerateGuestFromCampaign(sint32 campaign);
+
     };
 }