Mercurial > hg > openttd
changeset 17835:b783f0c424cb draft
(svn r22626) -Fix [FS#4622]: Also initialise _old_vds with newgame settings; TTD savegames do not contain these settings.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 03 Jul 2011 10:59:25 +0000 |
| parents | 371333fd42a2 |
| children | e20af6605036 |
| files | src/openttd.cpp src/settings_internal.h src/settings_type.h |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -314,7 +314,10 @@ } #endif /* ENABLE_AI */ + /* Copy newgame settings to active settings. + * Also initialise old settings needed for savegame conversion. */ _settings_game = _settings_newgame; + _old_vds = _settings_client.company.vehicle; #ifdef ENABLE_AI for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
--- a/src/settings_internal.h +++ b/src/settings_internal.h @@ -93,6 +93,4 @@ bool SetSettingValue(uint index, const char *value, bool force_newgame = false); void SetCompanySetting(uint index, int32 value); -extern VehicleDefaultSettings _old_vds; - #endif /* SETTINGS_INTERNAL_H */
--- a/src/settings_type.h +++ b/src/settings_type.h @@ -465,6 +465,9 @@ /** The settings values that are used for new games and/or modified in config file. */ extern GameSettings _settings_newgame; +/** Old vehicle settings, which were game settings before, and are company settings now. (Needed for savegame conversion) */ +extern VehicleDefaultSettings _old_vds; + /** * Get the settings-object applicable for the current situation: the newgame settings * when we're in the main menu and otherwise the settings of the current game.