Remove ClientMap::m_camera_mutex

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

diff --git a/src/database-dummy.cpp b/src/database-dummy.cpp
index 71f60d81c898188048d8ff5baa0fc935b7ae94e2..b38db1fb966f3c1dcbc5eddd3132b87bed4b2d45 100644 (file)
--- a/src/database-dummy.cpp
+++ b/src/database-dummy.cpp
@@ -33,10 +33,10 @@ bool Database_Dummy::saveBlock(const v3s16 &pos, const std::string &data)
 std::string Database_Dummy::loadBlock(const v3s16 &pos)
 {
        s64 i = getBlockAsInteger(pos);
-       if (m_database.count(i))
-               return m_database[i];
-       else
+       std::map<s64, std::string>::iterator it = m_database.find(i);
+       if (it == m_database.end())
                return "";
+       return it->second;
 }
 
 bool Database_Dummy::deleteBlock(const v3s16 &pos)
@@ -47,6 +47,7 @@ bool Database_Dummy::deleteBlock(const v3s16 &pos)
 
 void Database_Dummy::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
+       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));