Mercurial > hg > openttd

changeset 15531:93093fe9137c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20190) -Codechange: unVARDEF _generate_world and move it to genworld
author rubidium <rubidium@openttd.org>
date Mon, 19 Jul 2010 17:17:36 +0000
parents d2f5d90e6265
children 9991a5f2af05
files src/genworld.cpp src/genworld.h src/industry_gui.cpp src/newgrf.cpp src/newgrf_house.cpp src/road_cmd.cpp src/terraform_cmd.cpp src/town_gui.cpp src/variables.h
diffstat 9 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -62,6 +62,9 @@
 /** 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
--- a/src/genworld.h
+++ b/src/genworld.h
@@ -98,5 +98,6 @@
 
 extern class ThreadMutex *_genworld_mapgen_mutex;
 extern class ThreadMutex *_genworld_paint_mutex;
+extern bool _generating_world;
 
 #endif /* GENWORLD_H */
--- 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"
--- 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"
--- 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];
--- 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"
 
--- 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"
 
--- 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"
--- 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 */