miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 12.0-beta1

Browse Source
This commit is contained in:
dP
2021-08-15 14:57:29 +03:00
parent ac7d3eba75
commit 9df4f2c4fc
666 changed files with 61302 additions and 20466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/genworld.cpp
View File

@@ -76,7 +76,7 @@ static void CleanupGeneration()
_gw.proc = nullptr;
_gw.abortp = nullptr;
DeleteWindowByClass(WC_MODAL_PROGRESS);
CloseWindowByClass(WC_MODAL_PROGRESS);
ShowFirstError();
MarkWholeScreenDirty();
}
@@ -91,7 +91,7 @@ static void _GenerateWorld()
try {
_generating_world = true;
if (_network_dedicated) DEBUG(net, 1, "Generating map, please wait...");
if (_network_dedicated) Debug(net, 3, "Generating map, please wait...");
/* Set the Random() seed to generation_seed so we produce the same map with the same seed */
if (_settings_game.game_creation.generation_seed == GENERATE_NEW_SEED) _settings_game.game_creation.generation_seed = _settings_newgame.game_creation.generation_seed = InteractiveRandom();
_random.SetSeed(_settings_game.game_creation.generation_seed);
@@ -188,8 +188,8 @@ static void _GenerateWorld()
ShowNewGRFError();
if (_network_dedicated) DEBUG(net, 1, "Map generated, starting game");
DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);
if (_network_dedicated) Debug(net, 3, "Map generated, starting game");
Debug(desync, 1, "new_map: {:08x}", _settings_game.game_creation.generation_seed);
if (_debug_desync_level > 0) {
char name[MAX_PATH];
@@ -204,7 +204,7 @@ static void _GenerateWorld()
if (_network_dedicated) {
/* Exit the game to prevent a return to main menu. */
DEBUG(net, 0, "Generating map failed, aborting");
Debug(net, 0, "Generating map failed; closing server");
_exit_game = true;
} else {
SwitchToMode(_switch_mode);
@@ -314,7 +314,7 @@ void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_setti
SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0);
UnshowCriticalError();
DeleteAllNonVitalWindows();
CloseAllNonVitalWindows();
HideVitalWindows();
ShowGenerateWorldProgress();