mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
This commit is contained in:
parent
51ca546a9d
commit
73527b7b45
|
@ -62,6 +62,9 @@ ThreadMutex *_genworld_mapgen_mutex = ThreadMutex::New();
|
|||
/** Rights for the painting */
|
||||
ThreadMutex *_genworld_paint_mutex = ThreadMutex::New();
|
||||
|
||||
/** Whether we are generating the map or not. */
|
||||
bool _generating_world;
|
||||
|
||||
/**
|
||||
* Tells if the world generation is done in a thread or not.
|
||||
* @return the 'threaded' status
|
||||
|
|
|
@ -98,5 +98,6 @@ void StartScenarioEditor();
|
|||
|
||||
extern class ThreadMutex *_genworld_mapgen_mutex;
|
||||
extern class ThreadMutex *_genworld_paint_mutex;
|
||||
extern bool _generating_world;
|
||||
|
||||
#endif /* GENWORLD_H */
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include "core/geometry_func.hpp"
|
||||
#include "core/random_func.hpp"
|
||||
#include "core/backup_type.hpp"
|
||||
#include "genworld.h"
|
||||
|
||||
#include "table/strings.h"
|
||||
#include "table/sprites.h"
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include "core/alloc_type.hpp"
|
||||
#include "core/mem_func.hpp"
|
||||
#include "smallmap_gui.h"
|
||||
#include "genworld.h"
|
||||
|
||||
#include "table/strings.h"
|
||||
#include "table/build_industry.h"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "town.h"
|
||||
#include "core/random_func.hpp"
|
||||
#include "sprite.h"
|
||||
#include "genworld.h"
|
||||
|
||||
static BuildingCounts<uint32> _building_counts;
|
||||
static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#include "core/random_func.hpp"
|
||||
#include "newgrf_railtype.h"
|
||||
#include "date_func.h"
|
||||
#include "genworld.h"
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "variables.h"
|
||||
#include "functions.h"
|
||||
#include "economy_func.h"
|
||||
#include "genworld.h"
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "core/geometry_func.hpp"
|
||||
#include "station_base.h"
|
||||
#include "depot_base.h"
|
||||
#include "genworld.h"
|
||||
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
|
|
@ -19,7 +19,4 @@
|
|||
/* Amount of game ticks */
|
||||
VARDEF uint16 _tick_counter;
|
||||
|
||||
/* IN/OUT parameters to commands */
|
||||
VARDEF bool _generating_world;
|
||||
|
||||
#endif /* VARIABLES_H */
|
||||
|
|
Loading…
Reference in New Issue