mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.

This commit is contained in:
peter1138 2006-12-10 12:12:26 +00:00
parent aea6916e3a
commit df1684b0d9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openttd.c
View File

@ -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;