diff options
| author | rubidium <rubidium@openttd.org> | 2010-07-19 17:17:36 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-07-19 17:17:36 +0000 |
| commit | 73527b7b4506cb7f34ac44a1fbcfbc200c320dbd (patch) | |
| tree | 4e51a7408d350522bc9021dda1185344176110df /src | |
| parent | 51ca546a9dda04ba3b43a35fc0e751d31204244a (diff) | |
| download | openttd-73527b7b4506cb7f34ac44a1fbcfbc200c320dbd.tar.xz | |
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
Diffstat (limited to 'src')
| -rw-r--r-- | src/genworld.cpp | 3 | ||||
| -rw-r--r-- | src/genworld.h | 1 | ||||
| -rw-r--r-- | src/industry_gui.cpp | 1 | ||||
| -rw-r--r-- | src/newgrf.cpp | 1 | ||||
| -rw-r--r-- | src/newgrf_house.cpp | 1 | ||||
| -rw-r--r-- | src/road_cmd.cpp | 1 | ||||
| -rw-r--r-- | src/terraform_cmd.cpp | 1 | ||||
| -rw-r--r-- | src/town_gui.cpp | 1 | ||||
| -rw-r--r-- | src/variables.h | 3 |
9 files changed, 10 insertions, 3 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp index 5ef70655b..b4cab558b 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -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 diff --git a/src/genworld.h b/src/genworld.h index 6dd89e06e..e98b92cc1 100644 --- a/src/genworld.h +++ b/src/genworld.h @@ -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 */ diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index b226c7f49..adfb8bd20 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -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" diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 8c4fe36b0..b7eb461a9 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -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" diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index 4a80547c3..052594bbd 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -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]; diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 08536d710..6549f2047 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -37,6 +37,7 @@ #include "core/random_func.hpp" #include "newgrf_railtype.h" #include "date_func.h" +#include "genworld.h" #include "table/strings.h" diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp index 424aa9f37..49b55ef04 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -17,6 +17,7 @@ #include "variables.h" #include "functions.h" #include "economy_func.h" +#include "genworld.h" #include "table/strings.h" diff --git a/src/town_gui.cpp b/src/town_gui.cpp index 05c3ed260..b845ec7bc 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -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" diff --git a/src/variables.h b/src/variables.h index 762c0a53e..1d63d02f9 100644 --- a/src/variables.h +++ b/src/variables.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 */ |