X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserverobject.cpp;h=236d7e8dc06feaaca81fedb4c3479fc87ed3d103;hb=d1df09841d0eac7a88f638676b80ec848522cca5;hp=af77d466cc6258d160cc259d6bbab8b5596544fd;hpb=497ff1ecd64c8908f988e15ca879824f2781e3fd;p=dragonfireclient.git

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index af77d466c..236d7e8dc 100644
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+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
@@ -38,33 +38,37 @@ 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 +82,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,14 +90,9 @@ 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;
 		}
 	}