Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 458a366fc803a87515ac850293445be70f1d905a..14a2728baa457c264a8ffecae8336c98f4c2d003 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irr_v3d.h"
 #include "util/container.h"
 #include "map.h" // for ManualMapVoxelManipulator
+#include "mapgen.h" // for MapgenParams
 
 #define MGPARAMS_SET_MGNAME      1
 #define MGPARAMS_SET_SEED        2
@@ -37,9 +38,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        infostream << "EmergeThread: " x << std::endl; }
 
 class EmergeThread;
-class Mapgen;
-struct MapgenParams;
-struct MapgenFactory;
+//class Mapgen;
+//struct MapgenFactory;
 class Biome;
 class BiomeDefManager;
 class Decoration;
@@ -75,6 +75,7 @@ class IBackgroundBlockEmerger
 public:
        virtual bool enqueueBlockEmerge(u16 peer_id, v3s16 p,
                        bool allow_generate) = 0;
+       virtual ~IBackgroundBlockEmerger() {}
 };
 
 class EmergeManager : public IBackgroundBlockEmerger {
@@ -82,21 +83,21 @@ class EmergeManager : public IBackgroundBlockEmerger {
        INodeDefManager *ndef;
 
        std::map<std::string, MapgenFactory *> mglist;
-       
+
        std::vector<Mapgen *> mapgen;
        std::vector<EmergeThread *> emergethread;
-       
+
+       bool threads_active;
+
        //settings
-       MapgenParams *params;
+       MapgenParams params;
        bool mapgen_debug_info;
        u16 qlimit_total;
        u16 qlimit_diskonly;
        u16 qlimit_generate;
-       
-       MapgenParams *luaoverride_params;
-       u32 luaoverride_params_modified;
-       u32 luaoverride_flagmask;
-       
+
+       u32 gennotify;
+
        //block emerge queue data structures
        JMutex queuemutex;
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
@@ -110,18 +111,19 @@ class EmergeManager : public IBackgroundBlockEmerger {
        EmergeManager(IGameDef *gamedef);
        ~EmergeManager();
 
-       void initMapgens(MapgenParams *mgparams);
+       void initMapgens();
        Mapgen *getCurrentMapgen();
        Mapgen *createMapgen(std::string mgname, int mgid,
                                                MapgenParams *mgparams);
-       MapgenParams *createMapgenParams(std::string mgname);
-       void triggerAllThreads();
+       MapgenSpecificParams *createMapgenParams(std::string mgname);
+       void startThreads();
+       void stopThreads();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-       
+
        void registerMapgen(std::string name, MapgenFactory *mgfactory);
-       MapgenParams *getParamsFromSettings(Settings *settings);
-       void setParamsToSettings(Settings *settings);
-       
+       void loadParamsFromSettings(Settings *settings);
+       void saveParamsToSettings(Settings *settings);
+
        //mapgen helper methods
        Biome *getBiomeAtPoint(v3s16 p);
        int getGroundLevelAtPoint(v2s16 p);