Mercurial > hg > openttd
changeset 5313:f91cdcdf3756 draft
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
author | peter1138 <peter1138@openttd.org> |
---|---|
date | Sun, 10 Dec 2006 12:12:26 +0000 |
parents | 0408dd60f390 |
children | 834d4c90014e |
files | openttd.c |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/openttd.c +++ b/openttd.c @@ -615,6 +615,8 @@ { _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 @@ { _game_mode = GM_EDITOR; + ResetGRFConfig(true); + GenerateWorldSetCallback(&MakeNewEditorWorldDone); GenerateWorld(GW_EMPTY, 1 << _patches.map_x, 1 << _patches.map_y); } @@ -660,6 +664,8 @@ SetupColorsAndInitialWindow(); + ResetGRFConfig(true); + // Load game if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode) != SL_OK) { LoadIntroGame(); @@ -799,7 +805,6 @@ Player *p; _opt_ptr = &_opt; - ResetGRFConfig(true); _local_player = OWNER_NONE; _generating_world = true;