mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12755) -Fix (r12706): aborting map generation was not properly handled

release/0.7
glx 2008-04-17 19:53:13 +00:00
parent 02cdf01507
commit a2884f0a3c
1 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/genworld.cpp
View File

@ -86,6 +86,7 @@ bool IsGenerateWorldThreaded()
*/ */
static void * CDECL _GenerateWorld(void *arg) static void * CDECL _GenerateWorld(void *arg)
{ {
try {
_generating_world = true; _generating_world = true;
if (_network_dedicated) DEBUG(net, 0, "Generating map, please wait..."); if (_network_dedicated) DEBUG(net, 0, "Generating map, please wait...");
/* Set the Random() seed to generation_seed so we produce the same map with the same seed */ /* Set the Random() seed to generation_seed so we produce the same map with the same seed */
@ -164,7 +165,10 @@ static void * CDECL _GenerateWorld(void *arg)
if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game"); if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
if (_patches.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, 1, 0, NULL, CMD_PAUSE); if (_patches.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
} catch (...) {
_generating_world = false;
throw;
}
return NULL; return NULL;
} }