diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp index 798f1eae77..4e62c5e52e 100644 --- a/src/rct1/S4Importer.cpp +++ b/src/rct1/S4Importer.cpp @@ -11,6 +11,7 @@ extern "C" { #include "../audio/audio.h" + #include "../cheats.h" #include "../game.h" #include "../interface/window.h" #include "../localisation/date.h" @@ -57,10 +58,7 @@ void S4Importer::Import() ImportFinance(); ImportResearch(); ImportParkName(); - - RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) = _s4.park_flags; - RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED; - + ImportParkFlags(); ImportScenarioNameDetails(); ImportScenarioObjective(); ImportSavedView(); @@ -507,8 +505,13 @@ void S4Importer::ImportMapAnimations() void S4Importer::ImportFinance() { - RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, uint32) = ENCRYPT_MONEY(_s4.cash); RCT2_GLOBAL(RCT2_ADDRESS_PARK_ENTRANCE_FEE, money16) = _s4.park_entrance_fee; + RCT2_GLOBAL(RCT2_ADDRESS_LAND_COST, money16) = _s4.land_price; + RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCTION_RIGHTS_COST, money16) = _s4.construction_rights_price; + + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, uint32) = ENCRYPT_MONEY(_s4.cash); + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = _s4.loan; + RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) = _s4.max_loan; } void S4Importer::LoadObjects() @@ -723,6 +726,16 @@ void S4Importer::ImportParkName() } } +void S4Importer::ImportParkFlags() +{ + RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) = _s4.park_flags; + RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED; + if (!(_s4.park_flags & PARK_FLAGS_PARK_FREE_ENTRY)) + { + gCheatsUnlockAllPrices = true; + } +} + void S4Importer::ImportScenarioNameDetails() { rct_s6_info * s6Info = (rct_s6_info*)0x0141F570; diff --git a/src/rct1/S4Importer.h b/src/rct1/S4Importer.h index de040a684b..87d78cd654 100644 --- a/src/rct1/S4Importer.h +++ b/src/rct1/S4Importer.h @@ -74,6 +74,7 @@ private: void ImportResearch(); void InsertResearchVehicle(const rct1_research_item * researchItem, bool researched); void ImportParkName(); + void ImportParkFlags(); void ImportScenarioNameDetails(); void ImportScenarioObjective(); void ImportSavedView();