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

Fix #5881: gCheatsUnlockAllPrices persists when loading new scenarios

Browse Source
This commit is contained in:
CharlesLove
2017-07-22 15:20:52 -05:00
committed by Michael Steenbeek
parent 6a56c8c716
commit 88290337f6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2038,10 +2038,17 @@ private:
// Flags
gParkFlags = _s4.park_flags;
gParkFlags &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED;
// Loopy Landscape parks can set a flag to lock the entry price to free.
// If this flag is not set, the player can ask money for both rides and entry.
if (!(_s4.park_flags & RCT1_PARK_FLAGS_PARK_ENTRY_LOCKED_AT_FREE))
{
gCheatsUnlockAllPrices = true;
}
else
{
gCheatsUnlockAllPrices = false;
}
// RCT2 uses two flags for no money (due to the scenario editor). RCT1 used only one.
// Copy its value to make no money scenarios such as Arid Heights work properly.
if (_s4.park_flags & RCT1_PARK_FLAGS_NO_MONEY)

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

@@ -217,6 +217,8 @@ public:
gBankLoan = _s6.current_loan;
gParkFlags = _s6.park_flags;
gParkEntranceFee = _s6.park_entrance_fee;
// Force RCT2 scenarios to Unlock All Prices being false
gCheatsUnlockAllPrices = false;
// rct1_park_entrance_x
// rct1_park_entrance_y
// pad_013573EE