cpp/openttd-patchpack/source Changeset - r15285:5e6d23bfe802

Changeset - r15285:5e6d23bfe802

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

frosch - 14 years ago 2010-06-05 15:22:46
frosch@openttd.org

(svn r19934) -Fix [FS#3857]: When 'pause on new game' is set, pause the game before CleanupGeneration() to avoid conflicts with concurrent GUI code.

2 files changed with 2 insertions and 1 deletions:

src/genworld.cpp

src/openttd.cpp

0 comments (0 inline, 0 general)

src/genworld.cpp

➞

Show inline comments

@@ @@ -184,7 +184,6 @@ static void _GenerateWorld(void *) @@
 		if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
 		DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);
 		if (_settings_client.gui.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
 		if (_debug_desync_level > 0) {
 			char name[MAX_PATH];
 			snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);

src/openttd.cpp

➞

Show inline comments

@@ @@ -820,6 +820,8 @@ static void MakeNewGameDone() @@
+	}
 #endif /* ENABLE_NETWORK */
 	if (_settings_client.gui.pause_on_newgame) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
 	MarkWholeScreenDirty();
+}

0 comments (0 inline, 0 general)