diff --git a/src/openrct2/GameState.h b/src/openrct2/GameState.h index f6d2c3b1c8..c4a3b6d075 100644 --- a/src/openrct2/GameState.h +++ b/src/openrct2/GameState.h @@ -79,7 +79,6 @@ namespace OpenRCT2 std::vector restrictedScenery; std::vector peepSpawns; - uint8_t peepWarningThrottle[16]; News::ItemQueues newsItems; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index bd19f82ad7..258db6f2e7 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -961,7 +961,7 @@ void PeepProblemWarningsUpdate() Ride* ride; uint32_t hungerCounter = 0, lostCounter = 0, noexitCounter = 0, thirstCounter = 0, litterCounter = 0, disgustCounter = 0, toiletCounter = 0, vandalismCounter = 0; - uint8_t* warningThrottle = gameState.peepWarningThrottle; + uint8_t* warningThrottle = gameState.park.peepWarningThrottle; int32_t inQueueCounter = 0; int32_t tooLongQueueCounter = 0; diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 7ca45a4710..fcfa8bafc5 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -110,7 +110,7 @@ void News::InitQueue(GameState_t& gameState) assert(gameState.newsItems.IsEmpty()); // Throttles for warning types (PEEP_*_WARNING) - for (auto& warningThrottle : gameState.peepWarningThrottle) + for (auto& warningThrottle : gameState.park.peepWarningThrottle) { warningThrottle = 0; } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 9e86d397f6..76697e8165 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1004,7 +1004,7 @@ namespace OpenRCT2 cs.ReadWrite(gameState.park.guestGenerationProbability); cs.ReadWrite(gameState.park.suggestedGuestMaximum); - cs.ReadWriteArray(gameState.peepWarningThrottle, [&cs](uint8_t& value) { + cs.ReadWriteArray(gameState.park.peepWarningThrottle, [&cs](uint8_t& value) { cs.ReadWrite(value); return true; }); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 4d141f2cf1..cbf5f4ad19 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -499,7 +499,7 @@ namespace OpenRCT2::RCT2 gameState.park.totalAdmissions = _s6.TotalAdmissions; gameState.park.totalIncomeFromAdmissions = ToMoney64(_s6.IncomeFromAdmissions); gameState.park.companyValue = ToMoney64(_s6.CompanyValue); - std::memcpy(gameState.peepWarningThrottle, _s6.PeepWarningThrottle, sizeof(_s6.PeepWarningThrottle)); + std::memcpy(gameState.park.peepWarningThrottle, _s6.PeepWarningThrottle, sizeof(_s6.PeepWarningThrottle)); // Awards auto& currentAwards = gameState.park.currentAwards; diff --git a/src/openrct2/world/ParkData.h b/src/openrct2/world/ParkData.h index fedc23d331..95b6cc7b13 100644 --- a/src/openrct2/world/ParkData.h +++ b/src/openrct2/world/ParkData.h @@ -119,6 +119,8 @@ namespace OpenRCT2::Park colour_t staffMechanicColour; colour_t staffSecurityColour; + uint8_t peepWarningThrottle[16]; + std::vector currentAwards; std::vector marketingCampaigns; };