Settings: Remove unused functions

[minetest.git] / src / serverenvironment.cpp

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index d485c32e8111323548bedf15786d5bacfe0cd0e9..320042e19e76bc2e7183ac815060922c025a28ac 100644 (file)
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -1228,11 +1228,6 @@ void ServerEnvironment::step(float dtime)
                }
        }
 
-       if (m_database_check_interval.step(dtime, 10.0f)) {
-               m_auth_database->pingDatabase();
-               m_player_database->pingDatabase();
-               m_map->pingDatabase();
-       }
        /*
                Manage active block list
        */
@@ -1359,8 +1354,8 @@ void ServerEnvironment::step(float dtime)
                std::shuffle(output.begin(), output.end(), m_rgen);
 
                int i = 0;
-               // The time budget for ABMs is 20%.
-               u32 max_time_ms = m_cache_abm_interval * 1000 / 5;
+               // determine the time budget for ABMs
+               u32 max_time_ms = m_cache_abm_interval * 1000 * m_cache_abm_time_budget;
                for (const v3s16 &p : output) {
                        MapBlock *block = m_map->getBlockNoCreateNoEx(p);
                        if (!block)
@@ -1603,14 +1598,14 @@ void ServerEnvironment::setStaticForActiveObjectsInBlock(
        }
 }
 
-ActiveObjectMessage ServerEnvironment::getActiveObjectMessage()
+bool ServerEnvironment::getActiveObjectMessage(ActiveObjectMessage *dest)
 {
        if(m_active_object_messages.empty())
-               return ActiveObjectMessage(0);
+               return false;
 
-       ActiveObjectMessage message = m_active_object_messages.front();
+       *dest = std::move(m_active_object_messages.front());
        m_active_object_messages.pop();
-       return message;
+       return true;
 }
 
 void ServerEnvironment::getSelectedActiveObjects(
@@ -2089,6 +2084,7 @@ PlayerDatabase *ServerEnvironment::openPlayerDatabase(const std::string &name,
 
        if (name == "dummy")
                return new Database_Dummy();
+
 #if USE_POSTGRESQL
        if (name == "postgresql") {
                std::string connect_string;
@@ -2096,6 +2092,12 @@ PlayerDatabase *ServerEnvironment::openPlayerDatabase(const std::string &name,
                return new PlayerDatabasePostgreSQL(connect_string);
        }
 #endif
+
+#if USE_LEVELDB
+       if (name == "leveldb")
+               return new PlayerDatabaseLevelDB(savedir);
+#endif
+
        if (name == "files")
                return new PlayerDatabaseFiles(savedir + DIR_DELIM + "players");
 
@@ -2116,7 +2118,7 @@ bool ServerEnvironment::migratePlayersDatabase(const GameParams &game_params,
        if (!world_mt.exists("player_backend")) {
                errorstream << "Please specify your current backend in world.mt:"
                        << std::endl
-                       << "    player_backend = {files|sqlite3|postgresql}"
+                       << "    player_backend = {files|sqlite3|leveldb|postgresql}"
                        << std::endl;
                return false;
        }