mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #21331 from Harry-Hopkinson/move-gNumGuestsInParkLastWeek-to-GameState_t

Browse Source 
Move gNumGuestsInParkLastWeek to GameState_t.
This commit is contained in:
Matt
2024-02-06 16:46:23 +02:00
committed by GitHub
parent 08fbdd1552 fd17842291
commit 9363a459a2
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/Editor.cpp
View File

@@ -321,7 +321,7 @@ namespace Editor
UpdateConsolidatedPatrolAreas();
gameState.NumGuestsInPark = 0;
gameState.NumGuestsHeadingForPark = 0;
gNumGuestsInParkLastWeek = 0;
gameState.NumGuestsInParkLastWeek = 0;
gGuestChangeModifier = 0;
if (fromSave)
{

1
src/openrct2/GameState.h
View File

@@ -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];

1
src/openrct2/entity/Guest.h
View File

@@ -461,7 +461,6 @@ enum
};
extern uint8_t gGuestChangeModifier;
extern uint32_t gNumGuestsInParkLastWeek;
void PeepThoughtSetFormatArgs(const PeepThought* thought, Formatter& ft);

1
src/openrct2/entity/Peep.cpp
View File

@@ -67,7 +67,6 @@ using namespace OpenRCT2;
using namespace OpenRCT2::Audio;
uint8_t gGuestChangeModifier;
uint32_t gNumGuestsInParkLastWeek;
uint8_t gPeepWarningThrottle[16];

2
src/openrct2/park/ParkFile.cpp
View File

@@ -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);

2
src/openrct2/rct2/S6Importer.cpp
View File

@@ -299,7 +299,7 @@ namespace RCT2
}
}
gNumGuestsInParkLastWeek = _s6.LastGuestsInPark;
gameState.NumGuestsInParkLastWeek = _s6.LastGuestsInPark;
// Pad01357BCA
gameState.StaffHandymanColour = _s6.HandymanColour;
gameState.StaffMechanicColour = _s6.MechanicColour;

6
src/openrct2/world/Park.cpp
View File

@@ -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);