summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-12-10 12:12:26 +0000
committerpeter1138 <peter1138@openttd.org>2006-12-10 12:12:26 +0000
commitdf1684b0d94d2a253994dcfa844d7aa8d0567343 (patch)
tree9857f7db98e6ed799957274bb8a91378c431cd38
parentaea6916e3a8276f72827d20198b216507bfb0a2d (diff)
downloadopenttd-df1684b0d94d2a253994dcfa844d7aa8d0567343.tar.xz
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
-rw-r--r--openttd.c7
1 files changed, 6 insertions, 1 deletions
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;