Textureable sun and moon.

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 8e55af4377ba55bcc935191b6b880a19d9095d1c..c2725d3d64e485bd95f3978c05714422c337d5d5 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 @@ class Map /*: public NodeContainer*/
                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 @@ class Map /*: public NodeContainer*/
                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);
 
        /*
@@ -299,7 +304,6 @@ class Map /*: public NodeContainer*/
        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 @@ class Map /*: public NodeContainer*/
        void transforming_liquid_add(v3s16 p);
        s32 transforming_liquid_size();
 
-       virtual s16 getHeat(v3s16 p);
-       virtual s16 getHumidity(v3s16 p);
-
 protected:
        friend class LuaVoxelManip;
 
@@ -419,6 +420,14 @@ class ServerMap : public Map
        */
        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);
 
@@ -488,20 +497,10 @@ class ServerMap : public Map
 
        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;