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 8e55af4377ba55bcc935191b6b880a19d9095d1c..9b505d8e66984807d19d305910f00126062dfc1f 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -61,6 +61,8 @@ enum MapEditEventType{
        MEET_ADDNODE,
        // Node removed (changed to air)
        MEET_REMOVENODE,
+       // Node swapped (changed without metadata change)
+       MEET_SWAPNODE,
        // Node metadata of block changed (not knowing which node exactly)
        // p stores block coordinate
        MEET_BLOCK_NODE_METADATA_CHANGED,
@@ -99,6 +101,8 @@ struct MapEditEvent
                        return VoxelArea(p);
                case MEET_REMOVENODE:
                        return VoxelArea(p);
+               case MEET_SWAPNODE:
+                       return VoxelArea(p);
                case MEET_BLOCK_NODE_METADATA_CHANGED:
                {
                        v3s16 np1 = p*MAP_BLOCKSIZE;
@@ -236,7 +240,8 @@ public:
                These handle lighting but not faces.
        */
        void addNodeAndUpdate(v3s16 p, MapNode n,
-                       std::map<v3s16, MapBlock*> &modified_blocks);
+                       std::map<v3s16, MapBlock*> &modified_blocks,
+                       bool remove_metadata = true);
        void removeNodeAndUpdate(v3s16 p,
                        std::map<v3s16, MapBlock*> &modified_blocks);
 
@@ -245,7 +250,7 @@ public:
                These emit events.
                Return true if succeeded, false if not.
        */
-       bool addNodeWithEvent(v3s16 p, MapNode n);
+       bool addNodeWithEvent(v3s16 p, MapNode n, bool remove_metadata = true);
        bool removeNodeWithEvent(v3s16 p);
 
        /*
@@ -265,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.
@@ -299,7 +304,6 @@ public:
        virtual void PrintInfo(std::ostream &out);
 
        void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks);
-       void transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks);
 
        /*
                Node metadata
@@ -346,9 +350,6 @@ public:
        void transforming_liquid_add(v3s16 p);
        s32 transforming_liquid_size();
 
-       virtual s16 getHeat(v3s16 p);
-       virtual s16 getHumidity(v3s16 p);
-
 protected:
        friend class LuaVoxelManip;
 
@@ -400,7 +401,7 @@ public:
                Blocks are generated by using these and makeBlock().
        */
        bool initBlockMake(BlockMakeData *data, v3s16 blockpos);
-       MapBlock *finishBlockMake(BlockMakeData *data,
+       void finishBlockMake(BlockMakeData *data,
                        std::map<v3s16, MapBlock*> &changed_blocks);
 
        /*
@@ -418,7 +419,15 @@ public:
 
        */
        MapBlock * emergeBlock(v3s16 p, bool create_blank=true);
-       
+
+       /*
+               Try to get a block.
+               If it does not exist in memory, add it to the emerge queue.
+               - Memory
+               - Emerge Queue (deferred disk or generate)
+       */
+       MapBlock *getBlockOrEmerge(v3s16 p3d);
+
        // Carries out any initialization necessary before block is sent
        void prepareBlock(MapBlock *block);
 
@@ -476,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);
@@ -488,20 +498,10 @@ public:
 
        bool isSavingEnabled(){ return m_map_saving_enabled; }
 
-       u64 getSeed(){ return m_seed; }
-
-       MapgenParams *getMapgenParams(){ return m_mgparams; }
-
-       // Parameters fed to the Mapgen
-       MapgenParams *m_mgparams;
-
-       virtual s16 updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
-       virtual s16 updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *block = NULL);
+       u64 getSeed();
+       s16 getWaterLevel();
 
 private:
-       // Seed used for all kinds of randomness in generation
-       u64 m_seed;
-       
        // Emerge manager
        EmergeManager *m_emerge;
 
@@ -524,14 +524,15 @@ private:
        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()
        {
@@ -539,39 +540,24 @@ public:
                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);
 
 protected:
        bool m_create_area;
+       Map *m_map;
+       /*
+               key = blockpos
+               value = flags describing the block
+       */
+       std::map<v3s16, u8> m_loaded_blocks;
 };
 
 #endif
-