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

update to 1.4.4

Browse Source
This commit is contained in:
Pavel Stupnikov
2015-01-02 04:56:11 +03:00
parent 44bec9e0da
commit afbb1b0617
237 changed files with 11473 additions and 8030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/genworld.cpp
+4 -4
View File
@@ -1,4 +1,4 @@
/* $Id: genworld.cpp 26371 2014-02-23 22:03:08Z frosch $ */
/* $Id: genworld.cpp 26544 2014-04-29 18:41:19Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -98,7 +98,7 @@ static void _GenerateWorld(void *)
try {
_generating_world = true;
_modal_progress_work_mutex->BeginCritical();
if (_network_dedicated) DEBUG(net, 0, "Generating map, please wait...");
if (_network_dedicated) DEBUG(net, 1, "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);
@@ -195,7 +195,7 @@ static void _GenerateWorld(void *)
ShowNewGRFError();
if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
if (_network_dedicated) DEBUG(net, 1, "Map generated, starting game");
DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);
if (_debug_desync_level > 0) {
@@ -328,7 +328,7 @@ void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_setti
_gw.thread = NULL;
}
if (!_video_driver->HasGUI() || !ThreadObject::New(&_GenerateWorld, NULL, &_gw.thread)) {
if (!VideoDriver::GetInstance()->HasGUI() || !ThreadObject::New(&_GenerateWorld, NULL, &_gw.thread)) {
DEBUG(misc, 1, "Cannot create genworld thread, reverting to single-threaded mode");
_gw.threaded = false;
_modal_progress_work_mutex->EndCritical();