Use fixed size for builtin menus on non-android platforms

[oweals/minetest.git] / src / clientobject.cpp

diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index e7c735dac03d2ce95e42296c2b77494cafc2636a..ae1be092fb601f57c9d08ec1b57ffc1de3387414 100644 (file)
--- 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="
                                <<(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;
 }