Rollback: Fail on bad precondition instead of causing assertion error

[minetest.git] / src / database-redis.h

diff --git a/src/database-redis.h b/src/database-redis.h
index cc33db7d4835eac55d296669f6c8b1ebbe38a500..45e702c83463a29c9e0a0e3e84247137ff84f2ae 100644 (file)
--- a/src/database-redis.h
+++ b/src/database-redis.h
@@ -28,23 +28,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <hiredis.h>
 #include <string>
 
-class ServerMap;
+class Settings;
 
 class Database_Redis : public Database
 {
 public:
-       Database_Redis(ServerMap *map, std::string savedir);
+       Database_Redis(Settings &conf);
+       ~Database_Redis();
+
        virtual void beginSave();
        virtual void endSave();
-       virtual bool saveBlock(v3s16 blockpos, std::string &data);
-       virtual std::string loadBlock(v3s16 blockpos);
-       virtual void listAllLoadableBlocks(std::list<v3s16> &dst);
-       virtual int Initialized(void);
-       ~Database_Redis();
+
+       virtual bool saveBlock(const v3s16 &pos, const std::string &data);
+       virtual std::string loadBlock(const v3s16 &pos);
+       virtual bool deleteBlock(const v3s16 &pos);
+       virtual void listAllLoadableBlocks(std::vector<v3s16> &dst);
+
 private:
-       ServerMap *srvmap;
        redisContext *ctx;
        std::string hash;
 };
+
+#endif // USE_REDIS
+
 #endif
-#endif
+