summaryrefslogtreecommitdiff
path: root/src/genworld.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-01-10 18:56:51 +0000
committerrubidium <rubidium@openttd.org>2007-01-10 18:56:51 +0000
commita7d0cdf95fd8847ab76b35446e1c9b77f8ef1cb7 (patch)
tree1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/genworld.cpp
parentce75f6549dd379b506c9f1e9383bd881aa7cf5c7 (diff)
downloadopenttd-a7d0cdf95fd8847ab76b35446e1c9b77f8ef1cb7.tar.xz
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'src/genworld.cpp')
-rw-r--r--src/genworld.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp
index ba9fe126f..eef47eaed 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -182,7 +182,7 @@ void WaitTillGeneratedWorld(void)
{
if (_gw.thread == NULL) return;
_gw.quit_thread = true;
- OTTDJoinThread(_gw.thread);
+ OTTDJoinThread((OTTDThread*)_gw.thread);
_gw.thread = NULL;
_gw.threaded = false;
}