diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-26 21:38:17 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-26 21:38:17 +0000 |
| commit | 495ca8fdb9e658ebcdb8aa90bafc2df107819ea9 (patch) | |
| tree | e42587f22d3cfe46d11f12be7b8d010c0fcd713a /src/openttd.cpp | |
| parent | a0b14f02c89d5083ee8b65a956cc68881004d3a4 (diff) | |
| download | openttd-495ca8fdb9e658ebcdb8aa90bafc2df107819ea9.tar.xz | |
(svn r13277) -Fix: opntitle 'jumping' to the temperate climate when closing the NewGRF settings window.
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index f15c0b8d7..06a818d41 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -588,10 +588,8 @@ int ttd_main(int argc, char *argv[]) /* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */ if (_settings_newgame.difficulty.diff_level == 9) SetDifficultyLevel(0, &_settings_newgame.difficulty); - /* Make sure _patches is filled with _patches_newgame if we switch to a game directly */ - if (_switch_mode != SM_NONE) { - UpdatePatches(); - } + /* Make sure _settings is filled with _settings_newgame if we switch to a game directly */ + if (_switch_mode != SM_NONE) _settings = _settings_newgame; /* initialize the ingame console */ IConsoleInit(); @@ -1916,8 +1914,6 @@ bool AfterLoadGame() } } - if (CheckSavegameVersion(22)) UpdatePatches(); - if (CheckSavegameVersion(25)) { Vehicle *v; FOR_ALL_VEHICLES(v) { |