GenericCAO: Fix light position for non-players, remove deprecated initialisation...

[dragonfireclient.git] / src / database-leveldb.h

diff --git a/src/database-leveldb.h b/src/database-leveldb.h
index 40bd01f253b06b2ff8331537b8c2ff0e44a3a7d9..d30f9f8f5dd9f733fb98bd879f603c681d0b8884 100644 (file)
--- a/src/database-leveldb.h
+++ b/src/database-leveldb.h
@@ -1,32 +1,48 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
 #include "config.h"
 
 #if USE_LEVELDB
-#ifndef DATABASE_LEVELDB_HEADER
-#define DATABASE_LEVELDB_HEADER
-
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "main.h"
-#include "filesys.h"
-#include "database.h"
 
+#include <string>
+#include "database.h"
 #include "leveldb/db.h"
 
-class Database_LevelDB : public Database
+class Database_LevelDB : public MapDatabase
 {
 public:
-       Database_LevelDB(ServerMap *map, std::string savedir);
-       virtual void beginSave();
-       virtual void endSave();
-        virtual void saveBlock(MapBlock *block);
-        virtual MapBlock* loadBlock(v3s16 blockpos);
-        virtual void listAllLoadableBlocks(core::list<v3s16> &dst);
-        virtual int Initialized(void);
+       Database_LevelDB(const std::string &savedir);
        ~Database_LevelDB();
+
+       bool saveBlock(const v3s16 &pos, const std::string &data);
+       void loadBlock(const v3s16 &pos, std::string *block);
+       bool deleteBlock(const v3s16 &pos);
+       void listAllLoadableBlocks(std::vector<v3s16> &dst);
+
+       void beginSave() {}
+       void endSave() {}
+
 private:
-       ServerMap *srvmap;
-       leveldb::DB* m_database;
+       leveldb::DB *m_database;
 };
-#endif
-#endif
+
+#endif // USE_LEVELDB