From 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <zhuravlevilya@ya.ru>
Date: Thu, 20 Dec 2012 21:19:49 +0400
Subject: Migrate to STL containers/algorithms.

---
 src/serverobject.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/serverobject.cpp')

diff --git a/src/serverobject.cpp b/src/serverobject.cpp
index beb17d31f..95735de17 100644
--- a/src/serverobject.cpp
+++ b/src/serverobject.cpp
@@ -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()
-- 
cgit v1.2.3