Modernize client code (#6250)

[oweals/minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index a143b660ff3646a6127234cdab9da38f2dd74cf0..cf0a27d638200ebdd55c08d075f879c777cf2f0b 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define EMERGE_HEADER
 
 #include <map>
+#include <mutex>
 #include "irr_v3d.h"
 #include "util/container.h"
 #include "mapgen.h" // for MapgenParams
@@ -42,23 +43,19 @@ class BiomeManager;
 class OreManager;
 class DecorationManager;
 class SchematicManager;
+class Server;
 
 // Structure containing inputs/outputs for chunk generation
 struct BlockMakeData {
-       MMVManip *vmanip;
-       u64 seed;
+       MMVManip *vmanip = nullptr;
+       u64 seed = 0;
        v3s16 blockpos_min;
        v3s16 blockpos_max;
        v3s16 blockpos_requested;
        UniqueQueue<v3s16> transforming_liquid;
-       INodeDefManager *nodedef;
-
-       BlockMakeData():
-               vmanip(NULL),
-               seed(0),
-               nodedef(NULL)
-       {}
+       INodeDefManager *nodedef = nullptr;
 
+       BlockMakeData() {}
        ~BlockMakeData() { delete vmanip; }
 };
 
@@ -94,11 +91,19 @@ public:
        bool enable_mapgen_debug_info;
 
        // Generation Notify
-       u32 gen_notify_on;
+       u32 gen_notify_on = 0;
        std::set<u32> gen_notify_on_deco_ids;
 
-       // Map generation parameters
-       MapgenParams params;
+       // Parameters passed to mapgens owned by ServerMap
+       // TODO(hmmmm): Remove this after mapgen helper methods using them
+       // are moved to ServerMap
+       MapgenParams *mgparams;
+
+       // Hackish workaround:
+       // For now, EmergeManager must hold onto a ptr to the Map's setting manager
+       // since the Map can only be accessed through the Environment, and the
+       // Environment is not created until after script initialization.
+       MapSettingsManager *map_settings_mgr;
 
        // Managers of various map generation-related components
        BiomeManager *biomemgr;
@@ -107,11 +112,11 @@ public:
        SchematicManager *schemmgr;
 
        // Methods
-       EmergeManager(IGameDef *gamedef);
+       EmergeManager(Server *server);
        ~EmergeManager();
+       DISABLE_CLASS_COPY(EmergeManager);
 
-       void loadMapgenParams();
-       void initMapgens();
+       bool initMapgens(MapgenParams *mgparams);
 
        void startThreads();
        void stopThreads();
@@ -135,23 +140,20 @@ public:
        Mapgen *getCurrentMapgen();
 
        // Mapgen helpers methods
-       Biome *getBiomeAtPoint(v3s16 p);
+       int getSpawnLevelAtPoint(v2s16 p);
        int getGroundLevelAtPoint(v2s16 p);
        bool isBlockUnderground(v3s16 blockpos);
 
-       static MapgenFactory *getMapgenFactory(const std::string &mgname);
-       static void getMapgenNames(
-               std::vector<const char *> *mgnames, bool include_hidden);
        static v3s16 getContainingChunk(v3s16 blockpos, s16 chunksize);
 
 private:
        std::vector<Mapgen *> m_mapgens;
        std::vector<EmergeThread *> m_threads;
-       bool m_threads_active;
+       bool m_threads_active = false;
 
-       Mutex m_queue_mutex;
+       std::mutex m_queue_mutex;
        std::map<v3s16, BlockEmergeData> m_blocks_enqueued;
-       std::map<u16, u16> m_peer_queue_count;
+       std::unordered_map<u16, u16> m_peer_queue_count;
 
        u16 m_qlimit_total;
        u16 m_qlimit_diskonly;
@@ -159,13 +161,18 @@ private:
 
        // Requires m_queue_mutex held
        EmergeThread *getOptimalThread();
-       bool pushBlockEmergeData(v3s16 pos, u16 peer_requested, u16 flags,
-               EmergeCompletionCallback callback, void *callback_param);
+
+       bool pushBlockEmergeData(
+               v3s16 pos,
+               u16 peer_requested,
+               u16 flags,
+               EmergeCompletionCallback callback,
+               void *callback_param,
+               bool *entry_already_exists);
+
        bool popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata);
 
        friend class EmergeThread;
-
-       DISABLE_CLASS_COPY(EmergeManager);
 };
 
 #endif