Clean up rollback

[minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 46580ed3b42520fef92dc192e7523688a9218916..c650e51b65090c7defd7febfccf12ad491b6c0cd 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -41,7 +41,7 @@ class ServerMapSector;
 class MapBlock;
 class NodeMetadata;
 class IGameDef;
-class IRollbackReportSink;
+class IRollbackManager;
 class EmergeManager;
 class ServerEnvironment;
 struct BlockMakeData;
@@ -197,14 +197,13 @@ class Map /*: public NodeContainer*/
 
        bool isValidPosition(v3s16 p);
 
-       // throws InvalidPositionException if not found
-       MapNode getNode(v3s16 p);
-
        // throws InvalidPositionException if not found
        void setNode(v3s16 p, MapNode & n);
 
        // Returns a CONTENT_IGNORE node if not found
-       MapNode getNodeNoEx(v3s16 p);
+       // If is_valid_position is not NULL then this will be set to true if the
+       // position is valid, otherwise false
+       MapNode getNodeNoEx(v3s16 p, bool *is_valid_position = NULL);
 
        void unspreadLight(enum LightBank bank,
                        std::map<v3s16, u8> & from_nodes,
@@ -270,7 +269,7 @@ class Map /*: public NodeContainer*/
 
        // Server implements this.
        // Client leaves it as no-op.
-       virtual void saveBlock(MapBlock *block){};
+       virtual bool saveBlock(MapBlock *block) { return false; };
 
        /*
                Updates usage timers and unloads unused blocks and sectors.
@@ -485,13 +484,16 @@ class ServerMap : public Map
        // Returns true if sector now resides in memory
        //bool deFlushSector(v2s16 p2d);
 
-       void saveBlock(MapBlock *block);
+       bool saveBlock(MapBlock *block, Database *db);
+       bool saveBlock(MapBlock *block);
        // This will generate a sector with getSector if not found.
        void loadBlock(std::string sectordir, std::string blockfile, MapSector *sector, bool save_after_load=false);
        MapBlock* loadBlock(v3s16 p);
        // Database version
        void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
 
+       void updateVManip(v3s16 pos);
+
        // For debug printing
        virtual void PrintInfo(std::ostream &out);
 
@@ -523,14 +525,15 @@ class ServerMap : public Map
        Database *dbase;
 };
 
+
 #define VMANIP_BLOCK_DATA_INEXIST     1
 #define VMANIP_BLOCK_CONTAINS_CIGNORE 2
 
-class MapVoxelManipulator : public VoxelManipulator
+class ManualMapVoxelManipulator : public VoxelManipulator
 {
 public:
-       MapVoxelManipulator(Map *map);
-       virtual ~MapVoxelManipulator();
+       ManualMapVoxelManipulator(Map *map);
+       virtual ~ManualMapVoxelManipulator();
 
        virtual void clear()
        {
@@ -538,39 +541,26 @@ class MapVoxelManipulator : public VoxelManipulator
                m_loaded_blocks.clear();
        }
 
-       virtual void emerge(VoxelArea a, s32 caller_id=-1);
-
-       void blitBack(std::map<v3s16, MapBlock*> & modified_blocks);
-
-protected:
-       Map *m_map;
-       /*
-               key = blockpos
-               value = flags describing the block
-       */
-       std::map<v3s16, u8> m_loaded_blocks;
-};
-
-class ManualMapVoxelManipulator : public MapVoxelManipulator
-{
-public:
-       ManualMapVoxelManipulator(Map *map);
-       virtual ~ManualMapVoxelManipulator();
-
        void setMap(Map *map)
        {m_map = map;}
 
-       virtual void emerge(VoxelArea a, s32 caller_id=-1);
-
        void initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
-                                               bool load_if_inexistent = true);
+                       bool load_if_inexistent = true);
 
        // This is much faster with big chunks of generated data
-       void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks);
+       void blitBackAll(std::map<v3s16, MapBlock*> * modified_blocks,
+                       bool overwrite_generated = true);
+
+       bool m_is_dirty;
 
 protected:
        bool m_create_area;
+       Map *m_map;
+       /*
+               key = blockpos
+               value = flags describing the block
+       */
+       std::map<v3s16, u8> m_loaded_blocks;
 };
 
 #endif
-