summaryrefslogtreecommitdiff
path: root/src/clientobject.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-17 20:23:54 +0200
committerGitHub <noreply@github.com>2017-08-17 20:23:54 +0200
commitc738d1eeabbbe9164a25f6b69bc7ec1a3b44b051 (patch)
tree6a7c153cd4e1f468c627ab5811e76fc7c77f9a44 /src/clientobject.cpp
parent9bd18874a14774f2585955719b77f8894d6e6618 (diff)
downloadminetest-c738d1eeabbbe9164a25f6b69bc7ec1a3b44b051.tar.gz
minetest-c738d1eeabbbe9164a25f6b69bc7ec1a3b44b051.tar.bz2
minetest-c738d1eeabbbe9164a25f6b69bc7ec1a3b44b051.zip
clientobject, clouds, collision, clientsimpleobject: code modernization (#6260)
* clientobject, clouds, collision, clientsimpleobject: code modernization * use range-based for loops * simplify some tests * various code style fixes * use emplace_back instead of push_back when necessary * use auto on some iterators * use default operator when needed * unroll v3s16 creation on collisionMoveSimple
Diffstat (limited to 'src/clientobject.cpp')
-rw-r--r--src/clientobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp
index 329f10469..f4b69201b 100644
--- a/src/clientobject.cpp
+++ b/src/clientobject.cpp
@@ -42,7 +42,7 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
Client *client, ClientEnvironment *env)
{
// Find factory function
- std::unordered_map<u16, Factory>::iterator n = m_types.find(type);
+ auto n = m_types.find(type);
if (n == m_types.end()) {
// If factory is not found, just return.
warningstream << "ClientActiveObject: No factory for type="
@@ -57,8 +57,8 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
void ClientActiveObject::registerType(u16 type, Factory f)
{
- std::unordered_map<u16, Factory>::iterator n = m_types.find(type);
- if(n != m_types.end())
+ auto n = m_types.find(type);
+ if (n != m_types.end())
return;
m_types[type] = f;
}