gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-11 00:34:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7646: Incomplete cleanup for non-threaded world generation failure (#7805)

Browse Source
This commit is contained in:
glx22 2019-11-14 21:13:15 +01:00 committed by Charles Pigott
parent 0bdbd509be
commit ddffe32f15
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/genworld.cpp
View File

@ -133,11 +133,17 @@ static void _GenerateWorld()
GenerateLandscape(_gw.mode); GenerateLandscape(_gw.mode);
GenerateClearTile(); GenerateClearTile();
/* only generate towns, tree and industries in newgame mode. */ /* Only generate towns, tree and industries in newgame mode. */
if (_game_mode != GM_EDITOR) { if (_game_mode != GM_EDITOR) {
if (!GenerateTowns(_settings_game.economy.town_layout)) { if (!GenerateTowns(_settings_game.economy.town_layout)) {
_cur_company.Restore(); _cur_company.Restore();
HandleGeneratingWorldAbortion(); HandleGeneratingWorldAbortion();
BasePersistentStorageArray::SwitchMode(PSM_LEAVE_GAMELOOP);
if (_network_dedicated) {
/* Exit the game to prevent a return to main menu. */
DEBUG(net, 0, "Generating map failed, aborting");
_exit_game = true;
}
return; return;
} }
GenerateIndustries(); GenerateIndustries();