mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Move .peepWarningThrottle into ParkData struct

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-13 23:22:07 +02:00
parent a99ffd9736
commit 26f13ca81d
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/GameState.h
View File

@@ -79,7 +79,6 @@ namespace OpenRCT2
std::vector<ScenerySelection> restrictedScenery;
std::vector<PeepSpawn> peepSpawns;
uint8_t peepWarningThrottle[16];
News::ItemQueues newsItems;

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

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

2
src/openrct2/management/NewsItem.cpp
View File

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

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

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

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

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

2
src/openrct2/world/ParkData.h
View File

@@ -119,6 +119,8 @@ namespace OpenRCT2::Park
colour_t staffMechanicColour;
colour_t staffSecurityColour;
uint8_t peepWarningThrottle[16];
std::vector<Award> currentAwards;
std::vector<MarketingCampaign> marketingCampaigns;
};