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 e68795c4a14443fa9935c72e7a10b5570aa0c648..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,7 +378,6 @@ class ServerMap : public Map
 
        void save(ModifiedState save_level);
        void listAllLoadableBlocks(std::vector<v3s16> &dst);
-       void listAllLoadedBlocks(std::vector<v3s16> &dst);
 
        MapgenParams *getMapgenParams();