From 5cb483a62ba12ed7cb3c3a0563ddff261b22d73d Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Wed, 13 Sep 2023 10:33:26 -0400 Subject: [PATCH] Codechange: Sync calendar and economy dates when loading NewGRFs --- src/newgrf.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 72687655ca..e61dba3c1c 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -9946,6 +9946,11 @@ void LoadNewGRF(uint load_index, uint num_baseset) TimerGameCalendar::Date date = TimerGameCalendar::date; TimerGameCalendar::Year year = TimerGameCalendar::year; 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; 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::date = TimerGameCalendar::ConvertYMDToDate(TimerGameCalendar::year, 0, 1); 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; _display_opt = 0; } @@ -10050,6 +10060,11 @@ void LoadNewGRF(uint load_index, uint num_baseset) TimerGameCalendar::year = year; TimerGameCalendar::date = date; TimerGameCalendar::date_fract = date_fract; + + TimerGameEconomy::year = economy_year; + TimerGameEconomy::date = economy_date; + TimerGameEconomy::date_fract = economy_date_fract; + TimerGameTick::counter = tick_counter; _display_opt = display_opt; }