diff options
Diffstat (limited to '')
-rw-r--r-- | src/emerge.h | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/emerge.h b/src/emerge.h index 0acc89a6d..5f73dcd86 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -14,8 +14,6 @@ class Biome; class BiomeDefManager; class EmergeThread; class ManualMapVoxelManipulator; -//class ServerMap; -//class MapBlock; #include "server.h" @@ -29,20 +27,19 @@ struct BlockMakeData { UniqueQueue<v3s16> transforming_liquid; INodeDefManager *nodedef; -// BlockMakeData(); -// ~BlockMakeData(); - -BlockMakeData(): - no_op(false), - vmanip(NULL), - seed(0), - nodedef(NULL) -{} - -~BlockMakeData() -{ - delete vmanip; -} + BlockMakeData(): + no_op(false), + vmanip(NULL), + seed(0), + nodedef(NULL) + {} + + ~BlockMakeData() { delete vmanip; } +}; + +struct BlockEmergeData { + u16 peer_requested; + u8 flags; }; class EmergeManager { @@ -53,7 +50,8 @@ public: MapgenParams *params; JMutex queuemutex; - std::map<v3s16, u8> blocks_enqueued; //change to a hashtable later + std::map<v3s16, BlockEmergeData *> blocks_enqueued; + std::map<u16, u16> peer_queue_count; Mapgen *mapgen; EmergeThread *emergethread; |