X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fclientobject.cpp;h=89a0474a40b1781dfd199e5f8efff8f7fbf1f2a7;hb=3955f512538ca7c6f2d2187f22d5a696da8e84d3;hp=93f3b1cca69fce3deb1176c8e00bb92db6efd440;hpb=ee0d3bacbce612c1abc6016cb7b0d684df25b820;p=oweals%2Fminetest.git

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 93f3b1cca..89a0474a4 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.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,51 +20,47 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientobject.h"
 #include "debug.h"
 #include "porting.h"
-#include "constants.h"
 
 /*
 	ClientActiveObject
 */
 
-ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef,
+ClientActiveObject::ClientActiveObject(u16 id, Client *client,
 		ClientEnvironment *env):
 	ActiveObject(id),
-	m_gamedef(gamedef),
+	m_client(client),
 	m_env(env)
 {
 }
 
 ClientActiveObject::~ClientActiveObject()
 {
-	removeFromScene();
+	removeFromScene(true);
 }
 
-ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef,
-		ClientEnvironment *env)
+ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
+		Client *client, ClientEnvironment *env)
 {
 	// Find factory function
-	core::map<u16, Factory>::Node *n;
-	n = m_types.find(type);
-	if(n == NULL)
-	{
+	UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type);
+	if(n == m_types.end()) {
 		// If factory is not found, just return.
-		dstream<<"WARNING: ClientActiveObject: No factory for type="
-				<<(int)type<<std::endl;
+		warningstream << "ClientActiveObject: No factory for type="
+				<< (int)type << std::endl;
 		return NULL;
 	}
 
-	Factory f = n->getValue();
-	ClientActiveObject *object = (*f)(gamedef, env);
+	Factory f = n->second;
+	ClientActiveObject *object = (*f)(client, env);
 	return object;
 }
 
 void ClientActiveObject::registerType(u16 type, Factory f)
 {
-	core::map<u16, Factory>::Node *n;
-	n = m_types.find(type);
-	if(n)
+	UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type);
+	if(n != m_types.end())
 		return;
-	m_types.insert(type, f);
+	m_types[type] = f;
 }