diff options
| author | Ilya Zhuravlev <zhuravlevilya@ya.ru> | 2012-12-20 21:19:49 +0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-11 19:08:39 -0400 |
| commit | 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 (patch) | |
| tree | ce32cd4be20e9be30367f2ad25d9dae6a0482898 /src/serverobject.cpp | |
| parent | e204bedf1d781e43b8caa334a99319efc5b7ce46 (diff) | |
| download | minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.gz minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.tar.bz2 minetest-6a1670dbc31cc0e44178bbd9ad34ff0d5981a060.zip | |
Migrate to STL containers/algorithms.
Diffstat (limited to 'src/serverobject.cpp')
| -rw-r--r-- | src/serverobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/serverobject.cpp b/src/serverobject.cpp index beb17d31f..95735de17 100644 --- a/src/serverobject.cpp +++ b/src/serverobject.cpp @@ -43,9 +43,9 @@ ServerActiveObject* ServerActiveObject::create(u8 type, const std::string &data) { // 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: ServerActiveObject: No factory for type=" @@ -53,18 +53,18 @@ ServerActiveObject* ServerActiveObject::create(u8 type, return NULL; } - Factory f = n->getValue(); + Factory f = n->second; ServerActiveObject *object = (*f)(env, pos, data); return object; } void ServerActiveObject::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; } float ServerActiveObject::getMinimumSavedMovement() |