diff options
| author | kwolekr <mirrorisim@gmail.com> | 2013-02-17 02:46:08 -0500 |
|---|---|---|
| committer | kwolekr <mirrorisim@gmail.com> | 2013-02-25 23:08:33 -0500 |
| commit | 67c59645ecd76cbf7a8186d0850ab5950e9ea22a (patch) | |
| tree | a75281bb1cd592a18f933c02030a2f58e360c73f /src/emerge.h | |
| parent | 5ec5b1cbd64a22e628be2cf03391883c44074811 (diff) | |
| download | minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.tar.gz minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.tar.bz2 minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.zip | |
Misc. cleanup and minor fixes
Diffstat (limited to 'src/emerge.h')
| -rw-r--r-- | src/emerge.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/emerge.h b/src/emerge.h index 7e0cc4850..e5014df58 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -7,6 +7,10 @@ #define BLOCK_EMERGE_ALLOWGEN (1<<0) +#define EMERGE_DBG_OUT(x) \ + { if (enable_mapgen_debug_info) \ + infostream << "EmergeThread: " x << std::endl; } + class Mapgen; class MapgenParams; class MapgenFactory; @@ -18,7 +22,6 @@ class ManualMapVoxelManipulator; #include "server.h" struct BlockMakeData { - bool no_op; ManualMapVoxelManipulator *vmanip; u64 seed; v3s16 blockpos_min; @@ -28,7 +31,6 @@ struct BlockMakeData { INodeDefManager *nodedef; BlockMakeData(): - no_op(false), vmanip(NULL), seed(0), nodedef(NULL) @@ -51,6 +53,7 @@ public: //settings MapgenParams *params; + bool mapgen_debug_info; u16 qlimit_total; u16 qlimit_diskonly; u16 qlimit_generate; @@ -104,7 +107,6 @@ public: mapgen(NULL), id(ethreadid) { - enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info"); } void *Thread(); |