OpenRCT2#21193: Move gParkValueHistory to GameState_t

Broxzier · Jan 25, 2024 · 99e1746 · 99e1746
1 parent 0c10435
commit 99e1746
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
@@ -691,7 +691,7 @@ class FinancesWindow final : public Window
         int32_t yAxisScale = 0;
         for (int32_t i = 0; i < 64; i++)
         {
-            auto balance = gParkValueHistory[i];
+            auto balance = gameState.ParkValueHistory[i];
             if (balance == MONEY64_UNDEFINED)
                 continue;
 
@@ -723,7 +723,7 @@ class FinancesWindow final : public Window
 
         // X axis labels and values
         coords = graphTopLeft + ScreenCoordsXY{ 98, 17 };
-        Graph::Draw(dpi, gParkValueHistory, 64, coords, yAxisScale, 0);
+        Graph::Draw(dpi, gameState.ParkValueHistory, 64, coords, yAxisScale, 0);
     }
 
 #pragma endregion

diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h
@@ -32,6 +32,7 @@ namespace OpenRCT2
         money64 ParkEntranceFee;
         uint32_t ParkSize;
         money64 ParkValue;
+        money64 ParkValueHistory[FINANCE_GRAPH_SIZE];
         ClimateType Climate;
         ClimateState ClimateCurrent;
         ClimateState ClimateNext;

diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp
@@ -46,7 +46,6 @@ money64 gCurrentExpenditure;
 money64 gCurrentProfit;
 money64 gHistoricalProfit;
 money64 gCashHistory[FINANCE_GRAPH_SIZE];
-money64 gParkValueHistory[FINANCE_GRAPH_SIZE];
 money64 gExpenditureTable[EXPENDITURE_TABLE_MONTH_COUNT][static_cast<int32_t>(ExpenditureType::Count)];
 
 /**
@@ -195,7 +194,7 @@ void FinanceResetHistory()
     {
         gCashHistory[i] = MONEY64_UNDEFINED;
         gameState.WeeklyProfitHistory[i] = MONEY64_UNDEFINED;
-        gParkValueHistory[i] = MONEY64_UNDEFINED;
+        gameState.ParkValueHistory[i] = MONEY64_UNDEFINED;
     }
 
     for (uint32_t i = 0; i < EXPENDITURE_TABLE_MONTH_COUNT; ++i)

diff --git a/src/openrct2/management/Finance.h b/src/openrct2/management/Finance.h
@@ -51,7 +51,6 @@ extern money64 gCurrentProfit;
 extern money64 gHistoricalProfit;
 
 extern money64 gCashHistory[FINANCE_GRAPH_SIZE];
-extern money64 gParkValueHistory[FINANCE_GRAPH_SIZE];
 extern money64 gExpenditureTable[EXPENDITURE_TABLE_MONTH_COUNT][static_cast<int32_t>(ExpenditureType::Count)];
 
 bool FinanceCheckMoneyRequired(uint32_t flags);

diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
@@ -935,7 +935,7 @@ namespace OpenRCT2
                         cs.ReadWrite(value);
                         return true;
                     });
-                    cs.ReadWriteArray(gParkValueHistory, [&cs](money64& value) {
+                    cs.ReadWriteArray(gameState.ParkValueHistory, [&cs](money64& value) {
                         cs.ReadWrite(value);
                         return true;
                     });

diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
@@ -1409,7 +1409,7 @@ namespace RCT1
             for (size_t i = 0; i < Limits::FinanceGraphSize; i++)
             {
                 gCashHistory[i] = ToMoney64(_s4.CashHistory[i]);
-                gParkValueHistory[i] = CorrectRCT1ParkValue(_s4.ParkValueHistory[i]);
+                gameState.ParkValueHistory[i] = CorrectRCT1ParkValue(_s4.ParkValueHistory[i]);
                 gameState.WeeklyProfitHistory[i] = ToMoney64(_s4.WeeklyProfitHistory[i]);
             }
 

diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
@@ -366,7 +366,7 @@ namespace RCT2
             {
                 gCashHistory[i] = ToMoney64(_s6.BalanceHistory[i]);
                 gameState.WeeklyProfitHistory[i] = ToMoney64(_s6.WeeklyProfitHistory[i]);
-                gParkValueHistory[i] = ToMoney64(_s6.ParkValueHistory[i]);
+                gameState.ParkValueHistory[i] = ToMoney64(_s6.ParkValueHistory[i]);
             }
 
             gameState.ScenarioCompletedCompanyValue = RCT12CompletedCompanyValueToOpenRCT2(_s6.CompletedCompanyValue);

diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp
@@ -43,6 +43,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <type_traits>
 
 using namespace OpenRCT2;
 
@@ -777,7 +778,8 @@ void Park::UpdateHistories()
     gameState.WeeklyProfitAverageDivisor = 0;
 
     // Update park value history
-    HistoryPushRecord<money64, std::size(gParkValueHistory)>(gParkValueHistory, gameState.ParkValue);
+    HistoryPushRecord<money64, std::extent_v<decltype(GameState_t::ParkValueHistory)>>(
+        gameState.ParkValueHistory, gameState.ParkValue);
 
     // Invalidate relevant windows
     auto intent = Intent(INTENT_ACTION_UPDATE_GUEST_COUNT);