Move HTTP request logging to infostream (#8526)

[oweals/minetest.git] / src / serverobject.cpp

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index deaa94f2c365e61a54b587a023cb3a47fe065c6a..4eebc0da4e21554cff5f7d2b9434964a3aa96103 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-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
@@ -21,50 +21,46 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <fstream>
 #include "inventory.h"
 #include "constants.h" // BS
+#include "log.h"
 
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
        ActiveObject(0),
-       m_known_by_count(0),
-       m_removed(false),
-       m_pending_deactivation(false),
-       m_static_exists(false),
-       m_static_block(1337,1337,1337),
        m_env(env),
        m_base_position(pos)
 {
 }
 
-ServerActiveObject::~ServerActiveObject()
-{
-}
-
-ServerActiveObject* ServerActiveObject::create(u8 type,
+ServerActiveObject* ServerActiveObject::create(ActiveObjectType type,
                ServerEnvironment *env, u16 id, v3f pos,
                const std::string &data)
 {
        // Find factory function
-       core::map<u16, Factory>::Node *n;
+       std::map<u16, Factory>::iterator n;
        n = m_types.find(type);
-       if(n == NULL)
-       {
+       if(n == m_types.end()) {
+               // These are 0.3 entity types, return without error.
+               if (ACTIVEOBJECT_TYPE_ITEM <= type && type <= ACTIVEOBJECT_TYPE_MOBV2) {
+                       return NULL;
+               }
+
                // If factory is not found, just return.
-               dstream<<"WARNING: ServerActiveObject: No factory for type="
+               warningstream<<"ServerActiveObject: No factory for type="
                                <<type<<std::endl;
                return NULL;
        }
 
-       Factory f = n->getValue();
+       Factory f = n->second;
        ServerActiveObject *object = (*f)(env, pos, data);
        return object;
 }
 
 void ServerActiveObject::registerType(u16 type, Factory f)
 {
-       core::map<u16, Factory>::Node *n;
+       std::map<u16, Factory>::iterator n;
        n = m_types.find(type);
-       if(n)
+       if(n != m_types.end())
                return;
-       m_types.insert(type, f);
+       m_types[type] = f;
 }
 
 float ServerActiveObject::getMinimumSavedMovement()
@@ -78,7 +74,7 @@ ItemStack ServerActiveObject::getWieldedItem() const
        if(inv)
        {
                const InventoryList *list = inv->getList(getWieldList());
-               if(list)
+               if(list && (getWieldIndex() < (s32)list->getSize()))
                        return list->getItem(getWieldIndex());
        }
        return ItemStack();
@@ -86,17 +82,11 @@ ItemStack ServerActiveObject::getWieldedItem() const
 
 bool ServerActiveObject::setWieldedItem(const ItemStack &item)
 {
-       Inventory *inv = getInventory();
-       if(inv)
-       {
-               InventoryList *list = inv->getList(getWieldList());
-               if (list)
-               {
+       if(Inventory *inv = getInventory()) {
+               if (InventoryList *list = inv->getList(getWieldList())) {
                        list->changeItem(getWieldIndex(), item);
-                       setInventoryModified();
                        return true;
                }
        }
        return false;
 }
-