(svn r15383) -Cleanup: Don't call MakeNewgameSettingsLive more often than necessary.

2 files changed, 4 insertions, 6 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) ||
diff --git a/src/openttd.cpp b/src/openttd.cpp
index ac729c206..3d7bdc094 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -661,8 +661,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 _settings is filled with _settings_newgame if we switch to a game directly */
-	if (_switch_mode != SM_NONE) MakeNewgameSettingsLive();
+	/* Copy the settings needed for creating a new map. */
+	_settings_game.game_creation = _settings_newgame.game_creation;
 
 	/* initialize the ingame console */
 	IConsoleInit();