dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant year/month date globals

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-07 17:53:54 +01:00
parent c7f6a711b3
commit 53f9fa139d
9 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@@ -10318,16 +10318,16 @@ void LoadNewGRF(uint load_index, uint file_index, uint num_baseset)
* so all NewGRFs are loaded equally. For this we use the
* start date of the game and we set the counters, etc. to
* 0 so they're the same too. */
YearMonthDay date_ymd = _cur_date_ymd;
Date date = _date;
Year year = _cur_year;
DateFract date_fract = _date_fract;
uint16 tick_counter = _tick_counter;
uint8 tick_skip_counter = _tick_skip_counter;
byte display_opt = _display_opt;
if (_networking) {
_cur_year = _settings_game.game_creation.starting_year;
_date = ConvertYMDToDate(_cur_year, 0, 1);
_cur_date_ymd = { _settings_game.game_creation.starting_year, 0, 1};
_date = ConvertYMDToDate(_cur_date_ymd);
_date_fract = 0;
_tick_counter = 0;
_tick_skip_counter = 0;
@@ -10422,7 +10422,7 @@ void LoadNewGRF(uint load_index, uint file_index, uint num_baseset)
AfterLoadGRFs();
/* Now revert back to the original situation */
_cur_year = year;
_cur_date_ymd = date_ymd;
_date = date;
_date_fract = date_fract;
_tick_counter = tick_counter;