Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 3bc30c482a4634601dc863edbcf48353bc550927..e0db2e2627a01c4345df8978d90e895a4a43e784 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -160,7 +160,9 @@ class Map /*: public NodeContainer*/
        MapBlock * getBlockNoCreate(v3s16 p);
        // Returns NULL if not found
        MapBlock * getBlockNoCreateNoEx(v3s16 p);
-
+       
+       void listAllLoadedBlocks(std::vector<v3s16> &dst);
+       
        /* Server overrides */
        virtual MapBlock * emergeBlock(v3s16 p, bool create_blank=true)
        { return getBlockNoCreateNoEx(p); }
@@ -376,12 +378,11 @@ class ServerMap : public Map
 
        void save(ModifiedState save_level);
        void listAllLoadableBlocks(std::vector<v3s16> &dst);
-       void listAllLoadedBlocks(std::vector<v3s16> &dst);
 
        MapgenParams *getMapgenParams();
 
        bool saveBlock(MapBlock *block);
-       static bool saveBlock(MapBlock *block, MapDatabase *db);
+       static bool saveBlock(MapBlock *block, MapDatabase *db, int compression_level = -1);
        MapBlock* loadBlock(v3s16 p);
        // Database version
        void loadBlock(std::string *blob, v3s16 p3d, MapSector *sector, bool save_after_load=false);
@@ -416,13 +417,8 @@ class ServerMap : public Map
        std::string m_savedir;
        bool m_map_saving_enabled;
 
-#if 0
-       // Chunk size in MapSectors
-       // If 0, chunks are disabled.
-       s16 m_chunksize;
-       // Chunks
-       core::map<v2s16, MapChunk*> m_chunks;
-#endif
+       int m_map_compression_level;
+
        std::set<v3s16> m_chunks_in_progress;
 
        /*