summaryrefslogtreecommitdiff
path: root/src/genworld.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-14 19:54:33 +0000
committerrubidium <rubidium@openttd.org>2008-04-14 19:54:33 +0000
commit12188e7a5dde4cdd4304b3e738b7905e55f3ad9a (patch)
treea38226d767be0babf008f3304e7a61a4a00af2aa /src/genworld.h
parenta8008db23daf504af9f313ff0c53c5b89e756e05 (diff)
downloadopenttd-12188e7a5dde4cdd4304b3e738b7905e55f3ad9a.tar.xz
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
Diffstat (limited to 'src/genworld.h')
-rw-r--r--src/genworld.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/genworld.h b/src/genworld.h
index ebac04e16..1fc357d1c 100644
--- a/src/genworld.h
+++ b/src/genworld.h
@@ -5,16 +5,6 @@
#ifndef GENWORLD_H
#define GENWORLD_H
-/* If OTTDThread isn't defined, define it to a void, but make sure to undefine
- * it after this include. This makes including genworld.h easier, as you
- * don't need to include thread.h before it, while it stays possible to
- * include it after it, and still work.
- */
-#ifndef OTTDThread
-#define TEMPORARY_OTTDTHREAD_DEFINITION
-#define OTTDThread void
-#endif
-
#include "player_type.h"
/*
@@ -43,14 +33,9 @@ struct gw_info {
uint size_y; ///< Y-size of the map
gw_done_proc *proc; ///< Proc that is called when done (can be NULL)
gw_abort_proc *abortp; ///< Proc that is called when aborting (can be NULL)
- OTTDThread *thread; ///< The thread we are in (can be NULL)
+ class ThreadObject *thread; ///< The thread we are in (can be NULL)
};
-#ifdef TEMPORARY_OTTDTHREAD_DEFINITION
-#undef OTTDThread
-#undef TEMPORARY_OTTDTHREAD_DEFINITION
-#endif
-
enum gwp_class {
GWP_MAP_INIT, ///< Initialize/allocate the map, start economy
GWP_LANDSCAPE, ///< Create the landscape