Update to 1.10.0-beta2

src/genworld.cpp

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -135,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();