cpp/openttd-patchpack/source Changeset - r5313:3f75777ce3cb

Changeset - r5313:3f75777ce3cb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 17 years ago 2006-12-10 12:12:26
peter1138@openttd.org

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

1 file changed with 6 insertions and 1 deletions:

openttd.c

0 comments (0 inline, 0 general)

openttd.c

➞

Show inline comments

@@ @@ -615,6 +615,8 @@ static void MakeNewGame(bool from_height @@
+{
 	_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;

0 comments (0 inline, 0 general)