mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

import more flags and finance correctly

This commit is contained in:
Ted John 2016-04-17 16:57:49 +01:00
parent ba90d2a55a
commit 92973c692d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rct1/S4Importer.cpp
View File

@ -11,6 +11,7 @@
extern "C" extern "C"
{ {
#include "../audio/audio.h" #include "../audio/audio.h"
#include "../cheats.h"
#include "../game.h" #include "../game.h"
#include "../interface/window.h" #include "../interface/window.h"
#include "../localisation/date.h" #include "../localisation/date.h"
@ -57,10 +58,7 @@ void S4Importer::Import()
ImportFinance(); ImportFinance();
ImportResearch(); ImportResearch();
ImportParkName(); ImportParkName();
ImportParkFlags();
RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) = _s4.park_flags;
RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) &= ~PARK_FLAGS_ANTI_CHEAT_DEPRECATED;
ImportScenarioNameDetails(); ImportScenarioNameDetails();
ImportScenarioObjective(); ImportScenarioObjective();
ImportSavedView(); ImportSavedView();
@ -507,8 +505,13 @@ void S4Importer::ImportMapAnimations()
void S4Importer::ImportFinance() 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_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() 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() void S4Importer::ImportScenarioNameDetails()
{ {
rct_s6_info * s6Info = (rct_s6_info*)0x0141F570; rct_s6_info * s6Info = (rct_s6_info*)0x0141F570;

1
src/rct1/S4Importer.h
View File

@ -74,6 +74,7 @@ private:
void ImportResearch(); void ImportResearch();
void InsertResearchVehicle(const rct1_research_item * researchItem, bool researched); void InsertResearchVehicle(const rct1_research_item * researchItem, bool researched);
void ImportParkName(); void ImportParkName();
void ImportParkFlags();
void ImportScenarioNameDetails(); void ImportScenarioNameDetails();
void ImportScenarioObjective(); void ImportScenarioObjective();
void ImportSavedView(); void ImportSavedView();