mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Sync calendar and economy dates when loading NewGRFs

pull/11588/head
Tyler Trahan 2023-09-13 10:33:26 -04:00
parent 6c95929831
commit 5cb483a62b
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf.cpp
View File

@ -9946,6 +9946,11 @@ void LoadNewGRF(uint load_index, uint num_baseset)
TimerGameCalendar::Date date = TimerGameCalendar::date; TimerGameCalendar::Date date = TimerGameCalendar::date;
TimerGameCalendar::Year year = TimerGameCalendar::year; TimerGameCalendar::Year year = TimerGameCalendar::year;
TimerGameCalendar::DateFract date_fract = TimerGameCalendar::date_fract; TimerGameCalendar::DateFract date_fract = TimerGameCalendar::date_fract;
TimerGameEconomy::Date economy_date = TimerGameEconomy::date;
TimerGameEconomy::Year economy_year = TimerGameEconomy::year;
TimerGameEconomy::DateFract economy_date_fract = TimerGameEconomy::date_fract;
uint64_t tick_counter = TimerGameTick::counter; uint64_t tick_counter = TimerGameTick::counter;
byte display_opt = _display_opt; byte display_opt = _display_opt;
@ -9953,6 +9958,11 @@ void LoadNewGRF(uint load_index, uint num_baseset)
TimerGameCalendar::year = _settings_game.game_creation.starting_year; TimerGameCalendar::year = _settings_game.game_creation.starting_year;
TimerGameCalendar::date = TimerGameCalendar::ConvertYMDToDate(TimerGameCalendar::year, 0, 1); TimerGameCalendar::date = TimerGameCalendar::ConvertYMDToDate(TimerGameCalendar::year, 0, 1);
TimerGameCalendar::date_fract = 0; TimerGameCalendar::date_fract = 0;
TimerGameEconomy::year = _settings_game.game_creation.starting_year.base();
TimerGameEconomy::date = TimerGameEconomy::ConvertYMDToDate(TimerGameEconomy::year, 0, 1);
TimerGameEconomy::date_fract = 0;
TimerGameTick::counter = 0; TimerGameTick::counter = 0;
_display_opt = 0; _display_opt = 0;
} }
@ -10050,6 +10060,11 @@ void LoadNewGRF(uint load_index, uint num_baseset)
TimerGameCalendar::year = year; TimerGameCalendar::year = year;
TimerGameCalendar::date = date; TimerGameCalendar::date = date;
TimerGameCalendar::date_fract = date_fract; TimerGameCalendar::date_fract = date_fract;
TimerGameEconomy::year = economy_year;
TimerGameEconomy::date = economy_date;
TimerGameEconomy::date_fract = economy_date_fract;
TimerGameTick::counter = tick_counter; TimerGameTick::counter = tick_counter;
_display_opt = display_opt; _display_opt = display_opt;
} }