X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclientobject.cpp;h=a11757ea634829e3b2537a6f9829875247140faf;hb=65c09a96f41705bb8e75fc5ff4276342be91ed11;hp=e7c735dac03d2ce95e42296c2b77494cafc2636a;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=minetest.git

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index e7c735dac..a11757ea6 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -39,32 +39,31 @@ ClientActiveObject::~ClientActiveObject()
 	removeFromScene(true);
 }
 
-ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef,
-		ClientEnvironment *env)
+ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
+		IGameDef *gamedef, ClientEnvironment *env)
 {
 	// 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: ClientActiveObject: No factory for type="
+		warningstream<<"ClientActiveObject: No factory for type="
 				<<(int)type<<std::endl;
 		return NULL;
 	}
 
-	Factory f = n->getValue();
+	Factory f = n->second;
 	ClientActiveObject *object = (*f)(gamedef, env);
 	return object;
 }
 
 void ClientActiveObject::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;
 }