diff options
author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
commit | f35ed4bbc2b05f1b83476b60948d64375f77f1b4 (patch) | |
tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/genworld.cpp | |
parent | a332d10fd938f345fff18e5f4a662a58f692f734 (diff) | |
download | openttd-f35ed4bbc2b05f1b83476b60948d64375f77f1b4.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.cpp | 2 |
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; } |