Set server_announce to world.mt and respect modes when changing subgame

[minetest.git] / src / database.h

diff --git a/src/database.h b/src/database.h
index f4a2a4e8c85774bec999dfc75feec1b422393daf..cee7b6fd96d5589869ee2a5a9aa322193521923b 100644 (file)
--- a/src/database.h
+++ b/src/database.h
@@ -32,16 +32,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class Database
 {
 public:
-       virtual void beginSave() = 0;
-       virtual void endSave() = 0;
-
-       virtual bool saveBlock(v3s16 blockpos, std::string &data) = 0;
-       virtual std::string loadBlock(v3s16 blockpos) = 0;
-       virtual bool deleteBlock(v3s16 blockpos) = 0;
-       s64 getBlockAsInteger(const v3s16 pos) const;
-       v3s16 getIntegerAsBlock(s64 i) const;
+       virtual ~Database() {}
+
+       virtual void beginSave() {}
+       virtual void endSave() {}
+
+       virtual bool saveBlock(const v3s16 &pos, const std::string &data) = 0;
+       virtual std::string loadBlock(const v3s16 &pos) = 0;
+       virtual bool deleteBlock(const v3s16 &pos) = 0;
+
+       static s64 getBlockAsInteger(const v3s16 &pos);
+       static v3s16 getIntegerAsBlock(s64 i);
+
        virtual void listAllLoadableBlocks(std::vector<v3s16> &dst) = 0;
-       virtual int Initialized(void)=0;
-       virtual ~Database() {};
+
+       virtual bool initialized() const { return true; }
 };
+
 #endif
+