diff options
| author | rubidium <rubidium@openttd.org> | 2011-08-24 12:11:10 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-08-24 12:11:10 +0000 |
| commit | 9fe4b959ac90c91185ea0974f9a4d16091b0d3aa (patch) | |
| tree | b37424d61a55f93d00cf4b385a28d0842ecc53aa /src/genworld.cpp | |
| parent | fde0b4ce146455b4e5a4487973c21908485dba8c (diff) | |
| download | openttd-9fe4b959ac90c91185ea0974f9a4d16091b0d3aa.tar.xz | |
(svn r22818) -Fix [FS#4742] (r22796, rlongago): don't spawn threads for world generation and NewGRF scanning when using the dedicated or null video driver regardless of the used blitter
Diffstat (limited to 'src/genworld.cpp')
| -rw-r--r-- | src/genworld.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp index 151abc2b9..02d9cab05 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -24,7 +24,7 @@ #include "engine_func.h" #include "newgrf_storage.h" #include "water.h" -#include "blitter/factory.hpp" +#include "video/video_driver.hpp" #include "tilehighlight_func.h" #include "saveload/saveload.h" #include "void_map.h" @@ -310,8 +310,7 @@ void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_setti _gw.thread = NULL; } - if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 0 || - !ThreadObject::New(&_GenerateWorld, NULL, &_gw.thread)) { + if (!_video_driver->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(); |