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

Fix weekly profit import

This commit is contained in:
Gymnasiast 2021-05-09 20:04:04 +02:00
parent 8af70cf402
commit f3337de260
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1334,7 +1334,7 @@ private:
{
gCashHistory[i] = _s4.cash_history[i];
gParkValueHistory[i] = ToMoney64(CorrectRCT1ParkValue(_s4.park_value_history[i]));
gWeeklyProfitHistory[i] = _s4.weekly_profit_history[i];
gWeeklyProfitHistory[i] = ToMoney64(_s4.weekly_profit_history[i]);
}
for (size_t i = 0; i < RCT12_EXPENDITURE_TABLE_MONTH_COUNT; i++)

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

@ -311,7 +311,7 @@ public:
gCurrentExpenditure = _s6.current_expenditure;
gCurrentProfit = _s6.current_profit;
gWeeklyProfitAverageDividend = _s6.weekly_profit_average_dividend;
gWeeklyProfitAverageDividend = ToMoney64(_s6.weekly_profit_average_dividend);
gWeeklyProfitAverageDivisor = _s6.weekly_profit_average_divisor;
// pad_0135833A
@ -320,7 +320,7 @@ public:
for (size_t i = 0; i < RCT12_FINANCE_GRAPH_SIZE; i++)
{
gCashHistory[i] = _s6.balance_history[i];
gWeeklyProfitHistory[i] = _s6.weekly_profit_history[i];
gWeeklyProfitHistory[i] = ToMoney64(_s6.weekly_profit_history[i]);
gParkValueHistory[i] = ToMoney64(_s6.park_value_history[i]);
}

2
src/openrct2/scenario/Scenario.h
View File

@ -194,7 +194,7 @@ struct rct_s6_data
// SC6[11]
money32 current_expenditure;
money32 current_profit;
uint32_t weekly_profit_average_dividend;
money32 weekly_profit_average_dividend;
uint16_t weekly_profit_average_divisor;
uint8_t pad_0135833A[2];