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

Import more RCT1 fields

Browse Source
This commit is contained in:
Gymnasiast
2018-01-28 19:03:05 +01:00
committed by Michael Steenbeek
parent 9d04593734
commit b7ff54480c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/rct1/RCT1.h
View File

@@ -648,8 +648,8 @@ typedef struct rct1_s4 {
uint8 next_research_expected_day;
uint8 next_research_expected_month;
uint8 guest_initial_happiness;
uint16 cheat_detection_land_owned;
uint16 unk_199544;
uint16 park_size;
uint16 guest_generation_probability;
money16 total_ride_value_for_money;
money32 max_loan;
money16 guest_initial_cash;
@@ -670,7 +670,7 @@ typedef struct rct1_s4 {
money32 weekly_profit_history[RCT12_FINANCE_GRAPH_SIZE];
money32 park_value;
money32 park_value_history[RCT12_FINANCE_GRAPH_SIZE];
uint32 scenario_objective_score;
uint32 completed_company_value;
uint32 num_admissions;
money32 admission_total_income;
money32 company_value;

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

@@ -1787,6 +1787,7 @@ private:
}
gCurrentExpenditure = _s4.total_expenditure;
gScenarioCompletedCompanyValue = _s4.completed_company_value;
gTotalAdmissions = _s4.num_admissions;
gTotalIncomeFromAdmissions = _s4.admission_total_income;
@@ -2241,6 +2242,9 @@ private:
gGuestInitialCash = _s4.guest_initial_cash;
gGuestInitialHunger = _s4.guest_initial_hunger;
gGuestInitialThirst = _s4.guest_initial_thirst;
gGuestInitialHappiness = _s4.guest_initial_happiness;
_guestGenerationProbability = _s4.guest_generation_probability;
// Staff colours
gStaffHandymanColour = RCT1::GetColour(_s4.handman_colour);
@@ -2263,6 +2267,9 @@ private:
{
gParkFlags |= PARK_FLAGS_NO_MONEY_SCENARIO;
}
gParkSize = _s4.park_size;
gTotalRideValueForMoney = _s4.total_ride_value_for_money;
}
void ImportClimate()