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

(svn r15688) -Codechange: unifiy cleaning up the map generation (normal and abort)

release/0.7
rubidium 2009-03-12 14:28:55 +00:00
parent 8ed58f2b94
commit 9dbf8a163f
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/genworld.cpp
View File

@ -82,6 +82,26 @@ bool IsGenerateWorldThreaded()
return _gw.threaded && !_gw.quit_thread; return _gw.threaded && !_gw.quit_thread;
} }
/**
* Clean up the 'mess' of generation. That is show windows again, reset
* thread variables and delete the progress window.
*/
static void CleanupGeneration()
{
_generating_world = false;
if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE);
/* Show all vital windows again, because we have hidden them */
if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
_gw.active = false;
_gw.proc = NULL;
_gw.abortp = NULL;
_gw.threaded = false;
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
MarkWholeScreenDirty();
}
/** /**
* The internal, real, generate function. * The internal, real, generate function.
*/ */
@ -158,15 +178,7 @@ static void _GenerateWorld(void *arg)
if (_gw.proc != NULL) _gw.proc(); if (_gw.proc != NULL) _gw.proc();
IncreaseGeneratingWorldProgress(GWP_GAME_START); IncreaseGeneratingWorldProgress(GWP_GAME_START);
if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); CleanupGeneration();
/* Show all vital windows again, because we have hidden them */
if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
_gw.active = false;
_gw.proc = NULL;
_gw.threaded = false;
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
MarkWholeScreenDirty();
if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game"); if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
DEBUG(desync, 1, "new_map: %i\n", _settings_game.game_creation.generation_seed); DEBUG(desync, 1, "new_map: %i\n", _settings_game.game_creation.generation_seed);
@ -241,17 +253,7 @@ void HandleGeneratingWorldAbortion()
if (_gw.abortp != NULL) _gw.abortp(); if (_gw.abortp != NULL) _gw.abortp();
if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); CleanupGeneration();
/* Show all vital windows again, because we have hidden them */
if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows();
_gw.active = false;
_gw.proc = NULL;
_gw.abortp = NULL;
_gw.threaded = false;
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
MarkWholeScreenDirty();
_gw.thread->Exit(); _gw.thread->Exit();
} }