Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / map.h

diff --git a/src/map.h b/src/map.h
index 739cdb59b5ec448cbe1f8ba9f7800873b4e9d591..7e597bef6cb3d690eaf03ecb7186e6fd7e872aca 100644 (file)
--- a/src/map.h
+++ b/src/map.h
@@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "map_settings_manager.h"
 
 class Settings;
-class Database;
+class MapDatabase;
 class ClientMap;
 class MapSector;
 class ServerMapSector;
@@ -266,7 +266,8 @@ public:
        // For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: "
        virtual void PrintInfo(std::ostream &out);
 
-       void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks);
+       void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks,
+                       ServerEnvironment *env);
 
        /*
                Node metadata
@@ -429,7 +430,7 @@ public:
        /*
                Database functions
        */
-       static Database *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
+       static MapDatabase *createDatabase(const std::string &name, const std::string &savedir, Settings &conf);
 
        // Returns true if the database file does not exist
        bool loadFromFolders();
@@ -457,7 +458,7 @@ public:
        bool loadSectorMeta(v2s16 p2d);
 
        bool saveBlock(MapBlock *block);
-       static bool saveBlock(MapBlock *block, Database *db);
+       static bool saveBlock(MapBlock *block, MapDatabase *db);
        // This will generate a sector with getSector if not found.
        void loadBlock(const std::string &sectordir, const std::string &blockfile,
                        MapSector *sector, bool save_after_load=false);
@@ -509,7 +510,7 @@ private:
                This is reset to false when written on disk.
        */
        bool m_map_metadata_changed;
-       Database *dbase;
+       MapDatabase *dbase;
 };