dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-11-16 19:54:31 +00:00
parent 150a78c715 70f8c729d4
commit ab3a373c73
69 changed files with 805 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/genworld.cpp
View File

@@ -138,11 +138,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;
}
UpdateTownCargoBitmap();