summaryrefslogtreecommitdiff
path: root/src/emerge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emerge.h')
-rw-r--r--src/emerge.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/emerge.h b/src/emerge.h
index 5f73dcd86..b4461ae61 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -45,15 +45,20 @@ struct BlockEmergeData {
class EmergeManager {
public:
std::map<std::string, MapgenFactory *> mglist;
-
+
+ Mapgen *mapgen;
+ EmergeThread *emergethread;
+
//settings
MapgenParams *params;
-
+ u16 qlimit_total;
+ u16 qlimit_diskonly;
+ u16 qlimit_generate;
+
+ //block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
std::map<u16, u16> peer_queue_count;
- Mapgen *mapgen;
- EmergeThread *emergethread;
//biome manager
BiomeDefManager *biomedef;