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

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();