Limit speed in collisionMoveResult for avoiding hangs

[dragonfireclient.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index b4461ae6140d04cea452e2e6ef29bf6a559b8fe7..3d717bce3fd9f19a93746c3b8d7e67dcfabad97d 100644 (file)
--- 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)
@@ -46,11 +48,12 @@ class EmergeManager {
 public:
        std::map<std::string, MapgenFactory *> mglist;
        
-       Mapgen *mapgen;
-       EmergeThread *emergethread;
+       std::vector<Mapgen *> mapgen;
+       std::vector<EmergeThread *> emergethread;
        
        //settings
        MapgenParams *params;
+       bool mapgen_debug_info;
        u16 qlimit_total;
        u16 qlimit_diskonly;
        u16 qlimit_generate;
@@ -60,21 +63,20 @@ class EmergeManager {
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
        std::map<u16, u16> peer_queue_count;
 
-       //biome manager
+       //Mapgen-related structures
        BiomeDefManager *biomedef;
+       std::vector<Ore *> ores;
 
        EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef);
        ~EmergeManager();
 
        void initMapgens(MapgenParams *mgparams);
        Mapgen *createMapgen(std::string mgname, int mgid,
-                                               MapgenParams *mgparams, EmergeManager *emerge);
+                                               MapgenParams *mgparams);
        MapgenParams *createMapgenParams(std::string mgname);
-       Mapgen *getMapgen();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-       bool popBlockEmerge(v3s16 *pos, u8 *flags);
        
-       bool registerMapgen(std::string name, MapgenFactory *mgfactory);
+       void registerMapgen(std::string name, MapgenFactory *mgfactory);
        MapgenParams *getParamsFromSettings(Settings *settings);
        void setParamsToSettings(Settings *settings);
        
@@ -92,19 +94,20 @@ class EmergeThread : public SimpleThread
        EmergeManager *emerge;
        Mapgen *mapgen;
        bool enable_mapgen_debug_info;
+       int id;
        
 public:
        Event qevent;
        std::queue<v3s16> blockqueue;
        
-       EmergeThread(Server *server):
+       EmergeThread(Server *server, int ethreadid):
                SimpleThread(),
                m_server(server),
                map(NULL),
                emerge(NULL),
-               mapgen(NULL)
+               mapgen(NULL),
+               id(ethreadid)
        {
-               enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
        }
 
        void *Thread();
@@ -118,6 +121,7 @@ class EmergeThread : public SimpleThread
                }
        }
 
+       bool popBlockEmerge(v3s16 *pos, u8 *flags);
        bool getBlockOrStartGen(v3s16 p, MapBlock **b, 
                                                        BlockMakeData *data, bool allow_generate);
 };