From fd17842291eff11e03e7fb1029276b23ab8353f8 Mon Sep 17 00:00:00 2001
From: Harry Hopkinson <harryjhopkinson@gmail.com>
Date: Mon, 5 Feb 2024 09:50:58 +0000
Subject: [PATCH] Move gNumGuestsInParkLastWeek to GameState_t.

---
 src/openrct2/Editor.cpp          | 2 +-
 src/openrct2/GameState.h         | 1 +
 src/openrct2/entity/Guest.h      | 1 -
 src/openrct2/entity/Peep.cpp     | 1 -
 src/openrct2/park/ParkFile.cpp   | 2 +-
 src/openrct2/rct2/S6Importer.cpp | 2 +-
 src/openrct2/world/Park.cpp      | 6 +++---
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 951e767bab..f96d10c163 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -321,7 +321,7 @@ namespace Editor
         UpdateConsolidatedPatrolAreas();
         gameState.NumGuestsInPark = 0;
         gameState.NumGuestsHeadingForPark = 0;
-        gNumGuestsInParkLastWeek = 0;
+        gameState.NumGuestsInParkLastWeek = 0;
         gGuestChangeModifier = 0;
         if (fromSave)
         {
diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h
index d931d18e08..82bf17bf6b 100644
--- a/src/openrct2/GameState.h
+++ b/src/openrct2/GameState.h
@@ -49,6 +49,7 @@ namespace OpenRCT2
         uint32_t NextGuestNumber;
         uint32_t NumGuestsInPark;
         uint32_t NumGuestsHeadingForPark;
+        uint32_t NumGuestsInParkLastWeek;
         money64 WeeklyProfitAverageDividend;
         uint16_t WeeklyProfitAverageDivisor;
         money64 WeeklyProfitHistory[FINANCE_GRAPH_SIZE];
diff --git a/src/openrct2/entity/Guest.h b/src/openrct2/entity/Guest.h
index cca88e4c21..6ecee9a3a0 100644
--- a/src/openrct2/entity/Guest.h
+++ b/src/openrct2/entity/Guest.h
@@ -461,7 +461,6 @@ enum
 };
 
 extern uint8_t gGuestChangeModifier;
-extern uint32_t gNumGuestsInParkLastWeek;
 
 void PeepThoughtSetFormatArgs(const PeepThought* thought, Formatter& ft);
 
diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp
index e569f4a53a..13d620193f 100644
--- a/src/openrct2/entity/Peep.cpp
+++ b/src/openrct2/entity/Peep.cpp
@@ -67,7 +67,6 @@ using namespace OpenRCT2;
 using namespace OpenRCT2::Audio;
 
 uint8_t gGuestChangeModifier;
-uint32_t gNumGuestsInParkLastWeek;
 
 uint8_t gPeepWarningThrottle[16];
 
diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
index 40047387c4..48f78cc23c 100644
--- a/src/openrct2/park/ParkFile.cpp
+++ b/src/openrct2/park/ParkFile.cpp
@@ -907,7 +907,7 @@ namespace OpenRCT2
                     {
                         cs.ReadWrite(gTotalRideValueForMoney);
                     }
-                    cs.ReadWrite(gNumGuestsInParkLastWeek);
+                    cs.ReadWrite(gameState.NumGuestsInParkLastWeek);
                     cs.ReadWrite(gGuestChangeModifier);
                     cs.ReadWrite(_guestGenerationProbability);
                     cs.ReadWrite(_suggestedGuestMaximum);
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 6abbad9bc7..eacb3196cb 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -299,7 +299,7 @@ namespace RCT2
                 }
             }
 
-            gNumGuestsInParkLastWeek = _s6.LastGuestsInPark;
+            gameState.NumGuestsInParkLastWeek = _s6.LastGuestsInPark;
             // Pad01357BCA
             gameState.StaffHandymanColour = _s6.HandymanColour;
             gameState.StaffMechanicColour = _s6.MechanicColour;
diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp
index 4383cd1520..4be1e2d312 100644
--- a/src/openrct2/world/Park.cpp
+++ b/src/openrct2/world/Park.cpp
@@ -259,7 +259,7 @@ void Park::Initialise()
     gameState.StaffMechanicColour = COLOUR_LIGHT_BLUE;
     gameState.StaffSecurityColour = COLOUR_YELLOW;
     gameState.NumGuestsInPark = 0;
-    gNumGuestsInParkLastWeek = 0;
+    gameState.NumGuestsInParkLastWeek = 0;
     gameState.NumGuestsHeadingForPark = 0;
     gGuestChangeModifier = 0;
     gameState.ParkRating = 0;
@@ -754,7 +754,7 @@ void Park::UpdateHistories()
     auto& gameState = GetGameState();
     uint8_t guestChangeModifier = 1;
     int32_t changeInGuestsInPark = static_cast<int32_t>(gameState.NumGuestsInPark)
-        - static_cast<int32_t>(gNumGuestsInParkLastWeek);
+        - static_cast<int32_t>(gameState.NumGuestsInParkLastWeek);
     if (changeInGuestsInPark > -20)
     {
         guestChangeModifier++;
@@ -764,7 +764,7 @@ void Park::UpdateHistories()
         }
     }
     gGuestChangeModifier = guestChangeModifier;
-    gNumGuestsInParkLastWeek = gameState.NumGuestsInPark;
+    gameState.NumGuestsInParkLastWeek = gameState.NumGuestsInPark;
 
     // Update park rating, guests in park and current cash history
     HistoryPushRecord<uint8_t, 32>(gParkRatingHistory, gameState.ParkRating / 4);