diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-01-07 09:06:27 +0100 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-01-08 11:17:08 +0100 |
| commit | ef6b17baf74119e5c1515482cd6feb837afbe90b (patch) | |
| tree | 66cafe27944426ecf6c73482d752b71c3a958c52 | |
| parent | a1987df96acda0f58f88f2e154e26c529f59670b (diff) | |
| download | openttd-ef6b17baf74119e5c1515482cd6feb837afbe90b.tar.xz | |
Fix 2fd871e2af5: load correct ending-year for old (pre 0.7) savegames
Despite what it looked like, you could never really change the
ending-year (it was always reset to 2050 on start-up). See commit
683b65ee1 for details. As a side-effect, the variable that was
suppose to store the ending-year was just zero, never containing
a real ending-year.
| -rw-r--r-- | src/date.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/afterload.cpp | 7 | ||||
| -rw-r--r-- | src/table/settings.ini | 12 |
3 files changed, 3 insertions, 18 deletions
diff --git a/src/date.cpp b/src/date.cpp index 397d02c54..18e1ad180 100644 --- a/src/date.cpp +++ b/src/date.cpp @@ -28,8 +28,6 @@ Date _date; ///< Current date in days (day counter) DateFract _date_fract; ///< Fractional part of the day. uint16 _tick_counter; ///< Ever incrementing (and sometimes wrapping) tick counter for setting off various events -int32 _old_ending_year_slv_105; ///< Old ending year for savegames before SLV_105 - /** * Set the date. * @param date New date diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index c3aef307b..42e36022a 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -755,12 +755,7 @@ bool AfterLoadGame() _settings_game.linkgraph.distribution_default = DT_MANUAL; } - if (IsSavegameVersionBefore(SLV_105)) { - extern int32 _old_ending_year_slv_105; // in date.cpp - _settings_game.game_creation.ending_year = _old_ending_year_slv_105 - 1; - } else if (IsSavegameVersionBefore(SLV_ENDING_YEAR)) { - /* Ending year was a GUI setting before SLV_105, was removed in revision 683b65ee1 (svn r14755). */ - /* This also converts scenarios, both when loading them into the editor, and when starting a new game. */ + if (IsSavegameVersionBefore(SLV_ENDING_YEAR)) { _settings_game.game_creation.ending_year = DEF_END_YEAR; } diff --git a/src/table/settings.ini b/src/table/settings.ini index 1142bcc5e..573d8e710 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -47,8 +47,6 @@ static bool UpdateServerPassword(int32 p1); static bool UpdateRconPassword(int32 p1); static bool UpdateClientConfigValues(int32 p1); -extern int32 _old_ending_year_slv_105; - /* End - Callback Functions for the various settings */ /* Some settings do not need to be synchronised when playing in multiplayer. @@ -1405,15 +1403,9 @@ str = STR_CONFIG_SETTING_STARTING_YEAR strval = STR_JUST_INT cat = SC_BASIC -[SDTG_VAR] -name = ""old_ending_year_slv_105"" -var = _old_ending_year_slv_105 -flags = SLF_NOT_IN_CONFIG -type = SLE_INT32 +[SDT_NULL] +length = 4 to = SLV_105 -def = DEF_END_YEAR -min = MIN_YEAR -max = MAX_YEAR [SDT_VAR] base = GameSettings |