Add Lua on_mapgen_init callback, and minetest.set_mapgen_params API

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

diff --git a/src/emerge.h b/src/emerge.h
index fdca93c06253676ec11501d330e6120c68438815..ee95c348f9e1a595c2fa69c88853e49dc116d85e 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -24,6 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <queue>
 #include "util/thread.h"
 
+#define MGPARAMS_SET_MGNAME      1
+#define MGPARAMS_SET_SEED        2
+#define MGPARAMS_SET_WATER_LEVEL 4
+#define MGPARAMS_SET_FLAGS       8
+
 #define BLOCK_EMERGE_ALLOWGEN (1<<0)
 
 #define EMERGE_DBG_OUT(x) \
@@ -31,8 +36,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        infostream << "EmergeThread: " x << std::endl; }
 
 class Mapgen;
-class MapgenParams;
-class MapgenFactory;
+struct MapgenParams;
+struct MapgenFactory;
 class Biome;
 class BiomeDefManager;
 class EmergeThread;
@@ -79,6 +84,10 @@ public:
        u16 qlimit_diskonly;
        u16 qlimit_generate;
        
+       MapgenParams *luaoverride_params;
+       u32 luaoverride_params_modified;
+       u32 luaoverride_flagmask;
+       
        //block emerge queue data structures
        JMutex queuemutex;
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
@@ -87,11 +96,13 @@ public:
        //Mapgen-related structures
        BiomeDefManager *biomedef;
        std::vector<Ore *> ores;
+       std::vector<Decoration *> decorations;
 
        EmergeManager(IGameDef *gamedef);
        ~EmergeManager();
 
        void initMapgens(MapgenParams *mgparams);
+       Mapgen *getCurrentMapgen();
        Mapgen *createMapgen(std::string mgname, int mgid,
                                                MapgenParams *mgparams);
        MapgenParams *createMapgenParams(std::string mgname);
@@ -110,6 +121,7 @@ public:
 
 class EmergeThread : public SimpleThread
 {
+public:
        Server *m_server;
        ServerMap *map;
        EmergeManager *emerge;
@@ -117,7 +129,6 @@ class EmergeThread : public SimpleThread
        bool enable_mapgen_debug_info;
        int id;
        
-public:
        Event qevent;
        std::queue<v3s16> blockqueue;