diff options
| author | yexo <yexo@openttd.org> | 2009-02-14 23:17:32 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-02-14 23:17:32 +0000 |
| commit | 6381cbeeaeb41975aedc1e6d350c99f3cc488044 (patch) | |
| tree | 43e18e5dff5066194510325a031496915946c2d3 /src/genworld_gui.cpp | |
| parent | a6350c0287860b883dffedc32981a1ef35e274ff (diff) | |
| download | openttd-6381cbeeaeb41975aedc1e6d350c99f3cc488044.tar.xz | |
(svn r15495) -Revert (r15383,r15422): Loading NewGRFs depends on correct settings, but the economy can only be started after loading NewGRFs. In short: r15383 causes more problems then it's worth.
Diffstat (limited to 'src/genworld_gui.cpp')
| -rw-r--r-- | src/genworld_gui.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index b3c70f212..10d1b97df 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -248,8 +248,8 @@ void StartGeneratingLandscape(glwp_modes mode) { DeleteAllNonVitalWindows(); - /* Copy the settings needed for creating a new map. */ - _settings_game.game_creation = _settings_newgame.game_creation; + /* Copy all XXX_newgame to XXX when coming from outside the editor */ + MakeNewgameSettingsLive(); ResetGRFConfig(true); SndPlayFx(SND_15_BEEP); @@ -442,6 +442,8 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow { break; case GLAND_GENERATE_BUTTON: // Generate + MakeNewgameSettingsLive(); + if (mode == GLWP_HEIGHTMAP && (this->x * 2 < (1U << _settings_newgame.game_creation.map_x) || this->x / 2 > (1U << _settings_newgame.game_creation.map_x) || |