Merge branch 'save_ext' into improved_breakdowns

# Conflicts:
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2017-01-02 18:13:45 +00:00
278 changed files with 13510 additions and 5387 deletions

View File

@@ -248,7 +248,7 @@ static void InitializeWindowsAndCaches()
/* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it
* accordingly if it is not the case. No need to set it on companies that are not been used already,
* thus the MIN_YEAR (which is really nothing more than Zero, initialized value) test */
if (_file_to_saveload.filetype == FT_SCENARIO && c->inaugurated_year != MIN_YEAR) {
if (_file_to_saveload.abstract_ftype == FT_SCENARIO && c->inaugurated_year != MIN_YEAR) {
c->inaugurated_year = _cur_year;
}
}