From f9f6b5f341b8b296e58fa33a719bfd1ede5ebd05 Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Sun, 10 Dec 2006 12:12:26 +0000
Subject: (svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.

---
 openttd.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openttd.c b/openttd.c
index fa14a0f9a..68322079f 100644
--- a/openttd.c
+++ b/openttd.c
@@ -615,6 +615,8 @@ static void MakeNewGame(bool from_heightmap)
 {
 	_game_mode = GM_NORMAL;
 
+	ResetGRFConfig(true);
+
 	GenerateWorldSetCallback(&MakeNewGameDone);
 	GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y);
 }
@@ -630,6 +632,8 @@ static void MakeNewEditorWorld(void)
 {
 	_game_mode = GM_EDITOR;
 
+	ResetGRFConfig(true);
+
 	GenerateWorldSetCallback(&MakeNewEditorWorldDone);
 	GenerateWorld(GW_EMPTY, 1 << _patches.map_x, 1 << _patches.map_y);
 }
@@ -660,6 +664,8 @@ static void StartScenario(void)
 
 	SetupColorsAndInitialWindow();
 
+	ResetGRFConfig(true);
+
 	// Load game
 	if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode) != SL_OK) {
 		LoadIntroGame();
@@ -799,7 +805,6 @@ void SwitchMode(int new_mode)
 			Player *p;
 
 			_opt_ptr = &_opt;
-			ResetGRFConfig(true);
 
 			_local_player = OWNER_NONE;
 			_generating_world = true;
-- 
cgit v1.2.3-70-g09d2