|
@@ -2,22 +2,12 @@
|
|
|
|
|
|
/** @file genworld.h */
|
|
|
|
|
|
#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"
|
|
|
|
|
|
/*
|
|
|
* Order of these enums has to be the same as in lang/english.txt
|
|
|
* Otherwise you will get inconsistent behaviour.
|
|
|
*/
|
|
@@ -40,20 +30,15 @@ struct gw_info {
|
|
|
int mode; ///< What mode are we making a world in
|
|
|
PlayerID lp; ///< The local_player before generating
|
|
|
uint size_x; ///< X-size of the map
|
|
|
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
|
|
|
GWP_ROUGH_ROCKY, ///< Make rough and rocky areas
|
|
|
GWP_TOWN, ///< Generate towns
|
|
|
GWP_INDUSTRY, ///< Generate industries
|