Textureable sun and moon.

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 5ec1a0b9d2f2833b99018345d67f9bb353e454a0..c2725d3d64e485bd95f3978c05714422c337d5d5 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -304,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
@@ -351,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;
 
@@ -424,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);
 
@@ -493,21 +497,10 @@ class ServerMap : public Map
 
        bool isSavingEnabled(){ return m_map_saving_enabled; }
 
-       u64 getSeed(){ return m_seed; }
-
-       MapgenParams *getMapgenParams(){ return m_mgparams; }
-       void setMapgenParams(MapgenParams *mgparams){ m_mgparams = 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;