mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity

Introduce Scenario::Options struct; move cash and guest options

Browse Source
This commit is contained in:
Aaron van Geffen
2025-08-22 15:57:33 +02:00
parent 4b9a4ae604
commit aa35ec07cd
14 changed files with 115 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ namespace OpenRCT2
}
// Initial cash will eventually be removed
gameState.initialCash = gameState.park.cash;
gameState.scenarioOptions.initialCash = gameState.park.cash;
}
void Save(GameState_t& gameState, IStream& stream, int16_t compressionLevel)
@@ -601,19 +601,19 @@ namespace OpenRCT2
cs.write(randState.s1);
}
cs.readWrite(gameState.guestInitialHappiness);
cs.readWrite(gameState.scenarioOptions.guestInitialHappiness);
if (version <= 18)
{
money16 tempGuestInitialCash{};
cs.readWrite(tempGuestInitialCash);
gameState.guestInitialCash = ToMoney64(tempGuestInitialCash);
gameState.scenarioOptions.guestInitialCash = ToMoney64(tempGuestInitialCash);
}
else
{
cs.readWrite(gameState.guestInitialCash);
cs.readWrite(gameState.scenarioOptions.guestInitialCash);
}
cs.readWrite(gameState.guestInitialHunger);
cs.readWrite(gameState.guestInitialThirst);
cs.readWrite(gameState.scenarioOptions.guestInitialHunger);
cs.readWrite(gameState.scenarioOptions.guestInitialThirst);
cs.readWrite(gameState.nextGuestNumber);
cs.readWriteVector(gameState.peepSpawns, [&cs](PeepSpawn& spawn) {