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 d8669dd9b8a3834fc0f6206815968ace644ad1d9..cee7b6fd96d5589869ee2a5a9aa322193521923b 100644 (file)
--- a/src/database.h
+++ b/src/database.h
@@ -20,7 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef DATABASE_HEADER
 #define DATABASE_HEADER
 
-#include <list>
+#include <vector>
+#include <string>
 #include "irr_v3d.h"
 #include "irrlichttypes.h"
 
@@ -28,20 +29,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 #endif
 
-class MapBlock;
-
 class Database
 {
 public:
-       virtual void beginSave() = 0;
-       virtual void endSave() = 0;
-
-       virtual bool saveBlock(MapBlock *block) = 0;
-       virtual MapBlock *loadBlock(v3s16 blockpos) = 0;
-       s64 getBlockAsInteger(const v3s16 pos) const;
-       v3s16 getIntegerAsBlock(s64 i) const;
-       virtual void listAllLoadableBlocks(std::list<v3s16> &dst) = 0;
-       virtual int Initialized(void)=0;
-       virtual ~Database() {};
+       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 bool initialized() const { return true; }
 };
+
 #endif
+