summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/genworld.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 656a4f944..c76fe309d 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -133,11 +133,17 @@ static void _GenerateWorld()
GenerateLandscape(_gw.mode);
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 (!GenerateTowns(_settings_game.economy.town_layout)) {
_cur_company.Restore();
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;
}
GenerateIndustries();