Readded and optimized mapgen V6

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

diff --git a/src/map.h b/src/map.h
index a6a4bee8ed6bd230d7176d3ff76fc45a03aefa3f..3097d15b9fcc52549919ac1008d97118f55f4c21 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -26,12 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <sstream>
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include "mapnode.h"
 #include "constants.h"
 #include "voxel.h"
-#include "utility.h" // Needed for UniqueQueue, a member of Map
+#include "mapgen.h" //for BlockMakeData and EmergeManager
 #include "modifiedstate.h"
+#include "util/container.h"
+#include "nodetimer.h"
 
 extern "C" {
        #include "sqlite3.h"
@@ -43,10 +45,8 @@ class ServerMapSector;
 class MapBlock;
 class NodeMetadata;
 class IGameDef;
+class IRollbackReportSink;
 
-namespace mapgen{
-       struct BlockMakeData;
-};
 
 /*
        MapEditEvent
@@ -168,7 +168,7 @@ public:
        void removeEventReceiver(MapEventReceiver *event_receiver);
        // event shall be deleted by caller after the call.
        void dispatchEvent(MapEditEvent *event);
-
+       
        // On failure returns NULL
        MapSector * getSectorNoGenerateNoExNoLock(v2s16 p2d);
        // Same as the above (there exists no lock anymore)
@@ -310,6 +310,15 @@ public:
        void setNodeMetadata(v3s16 p, NodeMetadata *meta);
        void removeNodeMetadata(v3s16 p);
 
+       /*
+               Node Timers
+               These are basically coordinate wrappers to MapBlock
+       */
+       
+       NodeTimer getNodeTimer(v3s16 p);
+       void setNodeTimer(v3s16 p, NodeTimer t);
+       void removeNodeTimer(v3s16 p);
+
        /*
                Misc.
        */
@@ -326,7 +335,7 @@ protected:
        IGameDef *m_gamedef;
 
        core::map<MapEventReceiver*, bool> m_event_receivers;
-       
+
        core::map<v2s16, MapSector*> m_sectors;
 
        // Be sure to set this to NULL when the cached sector is deleted 
@@ -349,7 +358,7 @@ public:
        /*
                savedir: directory to which map data should be saved
        */
-       ServerMap(std::string savedir, IGameDef *gamedef);
+       ServerMap(std::string savedir, IGameDef *gamedef, EmergeManager *emerge);
        ~ServerMap();
 
        s32 mapType() const
@@ -368,15 +377,15 @@ public:
        /*
                Blocks are generated by using these and makeBlock().
        */
-       void initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos);
-       MapBlock* finishBlockMake(mapgen::BlockMakeData *data,
+       void initBlockMake(BlockMakeData *data, v3s16 blockpos);
+       MapBlock* finishBlockMake(BlockMakeData *data,
                        core::map<v3s16, MapBlock*> &changed_blocks);
        
-       // A non-threaded wrapper to the above
-       MapBlock * generateBlock(
+       // A non-threaded wrapper to the above  - DEFUNCT
+/*     MapBlock * generateBlock(
                        v3s16 p,
                        core::map<v3s16, MapBlock*> &modified_blocks
-       );
+       );*/
        
        /*
                Get a block from somewhere.
@@ -389,9 +398,10 @@ public:
                Forcefully get a block from somewhere.
                - Memory
                - Load from disk
-               - Generate
+               - Create blank filled with CONTENT_IGNORE
+               
        */
-       MapBlock * emergeBlock(v3s16 p, bool allow_generate=true);
+       MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
        
        // Helper for placing objects on ground level
        s16 findGroundLevel(v2s16 p2d);
@@ -468,6 +478,7 @@ public:
 
        u64 getSeed(){ return m_seed; }
 
+       EmergeManager *m_emerge;
 private:
        // Seed used for all kinds of randomness in generation
        u64 m_seed;