GUIHyperText: Fix bug with UTF8 chars in action name + simplify UTF8 stringw conversi...

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 135121b39c74822e9a72083ab2513ebfee7aeb36..df849e54210b397e3487de777036e1fb4cfa0749 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "network/networkprotocol.h"
 #include "irr_v3d.h"
 #include "util/container.h"
-#include "mapgen.h" // for MapgenParams
+#include "mapgen/mapgen.h" // for MapgenParams
 #include "map.h"
 
 #define BLOCK_EMERGE_ALLOW_GEN   (1 << 0)
@@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 }
 
 class EmergeThread;
-class INodeDefManager;
+class NodeDefManager;
 class Settings;
 
 class BiomeManager;
@@ -53,7 +53,7 @@ struct BlockMakeData {
        v3s16 blockpos_max;
        v3s16 blockpos_requested;
        UniqueQueue<v3s16> transforming_liquid;
-       INodeDefManager *nodedef = nullptr;
+       const NodeDefManager *nodedef = nullptr;
 
        BlockMakeData() = default;
 
@@ -88,7 +88,7 @@ struct BlockEmergeData {
 
 class EmergeManager {
 public:
-       INodeDefManager *ndef;
+       const NodeDefManager *ndef;
        bool enable_mapgen_debug_info;
 
        // Generation Notify
@@ -117,7 +117,7 @@ class EmergeManager {
        ~EmergeManager();
        DISABLE_CLASS_COPY(EmergeManager);
 
-       bool initMapgens(MapgenParams *mgparams);
+       void initMapgens(MapgenParams *mgparams);
 
        void startThreads();
        void stopThreads();