Allow full circle rotation with 2degs step for plantlike drawtype.

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

diff --git a/src/map.h b/src/map.h
index 7f482929e179b29222349b36eddc55e070b01405..9b505d8e66984807d19d305910f00126062dfc1f 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -270,7 +270,7 @@ public:
 
        // 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,7 +485,8 @@ public:
        // 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);
@@ -543,10 +544,11 @@ public:
        {m_map = map;}
 
        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);
 
 protected:
        bool m_create_area;
@@ -559,4 +561,3 @@ protected:
 };
 
 #endif
-