Position entity nametags relative to selection-box (#7031)

[dragonfireclient.git] / src / clientobject.cpp

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 869bd7483b15a2e41dc3f20dd9ac08afc4610f59..f4b69201ba9ad6fc38240995d7e0d388fdcf951f 100644 (file)
--- a/src/clientobject.cpp
+++ b/src/clientobject.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
@@ -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)
-       {
+       auto 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)
+       auto n = m_types.find(type);
+       if (n != m_types.end())
                return;
-       m_types.insert(type, f);
+       m_types[type] = f;
 }