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

Merge pull request #17012 from Gymnasiast/fix/17009

Browse Source 
Fix #17009: “No money” flag in SV6 saves not imported correctly
This commit is contained in:
Michael Steenbeek
2022-04-18 19:35:33 +02:00
committed by GitHub
parent 2653a0c976 d71f7a7697
commit adfd1b797c
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/rct1/S4Importer.cpp
View File

@@ -2206,11 +2206,6 @@ namespace RCT1
gParkFlags |= PARK_FLAGS_UNLOCK_ALL_PRICES;
}
if (_s4.park_flags & RCT1_PARK_FLAGS_NO_MONEY)
{
gParkFlags |= PARK_FLAGS_NO_MONEY;
}
gParkSize = _s4.park_size;
gTotalRideValueForMoney = _s4.total_ride_value_for_money;
gSamePriceThroughoutPark = 0;

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

@@ -256,10 +256,13 @@ namespace RCT2
gParkFlags = _s6.park_flags & ~PARK_FLAGS_NO_MONEY_SCENARIO;
// RCT2 used a different flag for `no money` when the park is a scenario
if (_s6.header.type == S6_TYPE_SCENARIO && (_s6.park_flags & PARK_FLAGS_NO_MONEY_SCENARIO))
gParkFlags |= PARK_FLAGS_NO_MONEY;
else
gParkFlags &= ~PARK_FLAGS_NO_MONEY;
if (_s6.header.type == S6_TYPE_SCENARIO)
{
if (_s6.park_flags & PARK_FLAGS_NO_MONEY_SCENARIO)
gParkFlags |= PARK_FLAGS_NO_MONEY;
else
gParkFlags &= ~PARK_FLAGS_NO_MONEY;
}
gParkEntranceFee = _s6.park_entrance_fee;
// rct1_park_entrance_x