Node highlighting.

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

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index 2609e301534a82abb2fd61112eb56c549e22d5fb..81307bc34f23a69d5f51f8e80bcc96d8b6fb6c9d 100644 (file)
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+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 General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+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.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverobject.h"
 #include <fstream>
 #include "inventory.h"
-#include "materials.h"
+#include "constants.h" // BS
 
 ServerActiveObject::ServerActiveObject(ServerEnvironment *env, v3f pos):
        ActiveObject(0),
@@ -43,9 +43,9 @@ ServerActiveObject* ServerActiveObject::create(u8 type,
                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())
        {
                // If factory is not found, just return.
                dstream<<"WARNING: ServerActiveObject: No factory for type="
@@ -53,18 +53,23 @@ ServerActiveObject* ServerActiveObject::create(u8 type,
                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()
+{
+       return 2.0*BS;
 }
 
 ItemStack ServerActiveObject::getWieldedItem() const
@@ -73,7 +78,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();