Fix umlauts/special character issue in lua gettext

[minetest.git] / src / clientobject.cpp

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index bec9f46fdd0c8a6cb5942c92cbe2fb55fbf5e36b..37f693c5e1310d0b4306fa9ff720b684db1e9adf 100644 (file)
--- 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.
 */
@@ -26,41 +26,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        ClientActiveObject
 */
 
-ClientActiveObject::ClientActiveObject(u16 id):
-       ActiveObject(id)
+ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef,
+               ClientEnvironment *env):
+       ActiveObject(id),
+       m_gamedef(gamedef),
+       m_env(env)
 {
 }
 
 ClientActiveObject::~ClientActiveObject()
 {
-       removeFromScene();
+       removeFromScene(true);
 }
 
-ClientActiveObject* ClientActiveObject::create(u8 type)
+ClientActiveObject* ClientActiveObject::create(u8 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="
-                               <<type<<std::endl;
+                               <<(int)type<<std::endl;
                return NULL;
        }
 
-       Factory f = n->getValue();
-       ClientActiveObject *object = (*f)();
+       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;
 }