(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.

1 files changed, 2 insertions, 6 deletions

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 96ee00c48..d2fc2c658 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -640,8 +640,8 @@ int ttd_main(int argc, char *argv[])
 
 	ResetGRFConfig(false);
 
-	/* Copy the settings needed for creating a new map. */
-	_settings_game.game_creation = _settings_newgame.game_creation;
+	/* Make sure _settings is filled with _settings_newgame if we switch to a game directly */
+	if (_switch_mode != SM_NONE) MakeNewgameSettingsLive();
 
 	/* initialize the ingame console */
 	IConsoleInit();
@@ -649,10 +649,6 @@ int ttd_main(int argc, char *argv[])
 	InitializeGUI();
 	IConsoleCmdExec("exec scripts/autoexec.scr 0");
 
-	/* Initialise the sprite/string tables. */
-	GfxLoadSprites();
-	LoadStringWidthTable();
-
 	GenerateWorld(GW_EMPTY, 64, 64); // Make the viewport initialization happy
 	WaitTillGeneratedWorld();