Node highlighting.

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

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index deaa94f2c365e61a54b587a023cb3a47fe065c6a..81307bc34f23a69d5f51f8e80bcc96d8b6fb6c9d 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
@@ -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,18 @@ 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()
@@ -78,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();