diff options
| author | Yexo <Yexo@openttd.org> | 2009-02-06 23:58:16 +0000 |
|---|---|---|
| committer | Yexo <Yexo@openttd.org> | 2009-02-06 23:58:16 +0000 |
| commit | caf540d284a8cb2a37afa9a0c4f35cb45dc05001 (patch) | |
| tree | 704d7185e6e469e445e05c612930425abba3f43a /src/genworld_gui.cpp | |
| parent | 0caa32816f35d71761652164f170f227714ff9c8 (diff) | |
| download | openttd-caf540d284a8cb2a37afa9a0c4f35cb45dc05001.tar.xz | |
(svn r15383) -Cleanup: Don't call MakeNewgameSettingsLive more often than necessary.
Diffstat (limited to 'src/genworld_gui.cpp')
| -rw-r--r-- | src/genworld_gui.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 1146894e8..b242de56d 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -248,8 +248,8 @@ void StartGeneratingLandscape(glwp_modes mode) { DeleteAllNonVitalWindows(); - /* Copy all XXX_newgame to XXX when coming from outside the editor */ - MakeNewgameSettingsLive(); + /* Copy the settings needed for creating a new map. */ + _settings_game.game_creation = _settings_newgame.game_creation; ResetGRFConfig(true); SndPlayFx(SND_15_BEEP); @@ -441,8 +441,6 @@ 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) || |