Simple decorations: Fix range check for deco->deco_param2

[minetest.git] / src / database-dummy.cpp

diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
index df1057274f4fc335209fa675b46f978055ba3d76..ef2148f70b742ea52db2c6190bdb11eb53820079 100644 (file)
--- a/src/database-dummy.cpp
+++ b/src/database-dummy.cpp
@@ -18,58 +18,42 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 /*
-Dummy "database" class
+Dummy database class
 */
 
-
 #include "database-dummy.h"
 
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "serialization.h"
-#include "main.h"
-#include "settings.h"
-#include "log.h"
 
-Database_Dummy::Database_Dummy(ServerMap *map)
+bool Database_Dummy::saveBlock(const v3s16 &pos, const std::string &data)
 {
-       srvmap = map;
+       m_database[getBlockAsInteger(pos)] = data;
+       return true;
 }
 
-int Database_Dummy::Initialized(void)
+void Database_Dummy::loadBlock(const v3s16 &pos, std::string *block)
 {
-       return 1;
-}
-
-void Database_Dummy::beginSave() {}
-void Database_Dummy::endSave() {}
+       s64 i = getBlockAsInteger(pos);
+       std::map<s64, std::string>::iterator it = m_database.find(i);
+       if (it == m_database.end()) {
+               *block = "";
+               return;
+       }
 
-bool Database_Dummy::saveBlock(v3s16 blockpos, std::string &data)
-{
-       m_database[getBlockAsInteger(blockpos)] = data;
-       return true;
+       *block = it->second;
 }
 
-std::string Database_Dummy::loadBlock(v3s16 blockpos)
+bool Database_Dummy::deleteBlock(const v3s16 &pos)
 {
-       if (m_database.count(getBlockAsInteger(blockpos)))
-               return m_database[getBlockAsInteger(blockpos)];
-       else
-               return "";
+       m_database.erase(getBlockAsInteger(pos));
+       return true;
 }
 
-void Database_Dummy::listAllLoadableBlocks(std::list<v3s16> &dst)
+void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
-       for(std::map<u64, std::string>::iterator x = m_database.begin(); x != m_database.end(); ++x)
-       {
-               v3s16 p = getIntegerAsBlock(x->first);
-               //dstream<<"block_i="<<block_i<<" p="<<PP(p)<<std::endl;
-               dst.push_back(p);
+       dst.reserve(m_database.size());
+       for (std::map<s64, std::string>::const_iterator x = m_database.begin();
+                       x != m_database.end(); ++x) {
+               dst.push_back(getIntegerAsBlock(x->first));
        }
 }
 
-Database_Dummy::~Database_Dummy()
-{
-       m_database.clear();
-}