diff options
author | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2009-05-15 23:55:06 +0000 |
commit | 31eff1d4c30803e09083320886630da8b28690d1 (patch) | |
tree | b8c0c563425389a5e9514760bb5e1cc9cf0013c1 /src/saveload/afterload.cpp | |
parent | aea2fcd0a09fa47caf022934ba8029ec327906f7 (diff) | |
download | openttd-31eff1d4c30803e09083320886630da8b28690d1.tar.xz |
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
Diffstat (limited to 'src/saveload/afterload.cpp')
-rw-r--r-- | src/saveload/afterload.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 87a5c9910..cc982485e 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -661,10 +661,10 @@ bool AfterLoadGame() * of course, we do need to initialize them for older savegames. */ if (CheckSavegameVersion(16)) { FOR_ALL_COMPANIES(c) { - c->engine_renew_list = NULL; - c->engine_renew = false; - c->engine_renew_months = -6; - c->engine_renew_money = 100000; + c->engine_renew_list = NULL; + c->settings.engine_renew = false; + c->settings.engine_renew_months = 6; + c->settings.engine_renew_money = 100000; } /* When loading a game, _local_company is not yet set to the correct value. @@ -675,9 +675,7 @@ bool AfterLoadGame() */ if (!_network_dedicated && IsValidCompanyID(COMPANY_FIRST)) { c = GetCompany(COMPANY_FIRST); - c->engine_renew = _settings_client.gui.autorenew; - c->engine_renew_months = _settings_client.gui.autorenew_months; - c->engine_renew_money = _settings_client.gui.autorenew_money; + c->settings = _settings_client.company; } } @@ -950,7 +948,7 @@ bool AfterLoadGame() * replaced, shall keep their old length. In all prior versions, just default * to false */ if (CheckSavegameVersionOldStyle(16, 1)) { - FOR_ALL_COMPANIES(c) c->renew_keep_length = false; + FOR_ALL_COMPANIES(c) c->settings.renew_keep_length = false; } /* In version 17, ground type is moved from m2 to m4 for depots and |