diff options
author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
---|---|---|
committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/clientobject.cpp | |
parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/clientobject.cpp')
-rw-r--r-- | src/clientobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp index e7c735dac..37f693c5e 100644 --- a/src/clientobject.cpp +++ b/src/clientobject.cpp @@ -43,9 +43,9 @@ 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=" @@ -53,18 +53,18 @@ ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef, 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; } |