aboutsummaryrefslogtreecommitdiff
path: root/src/client/clientobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/clientobject.cpp')
-rw-r--r--src/client/clientobject.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/client/clientobject.cpp b/src/client/clientobject.cpp
index f4b69201b..af8b35da1 100644
--- a/src/client/clientobject.cpp
+++ b/src/client/clientobject.cpp
@@ -25,11 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
ClientActiveObject
*/
-ClientActiveObject::ClientActiveObject(u16 id, Client *client,
- ClientEnvironment *env):
- ActiveObject(id),
- m_client(client),
- m_env(env)
+ClientActiveObject::ClientActiveObject(u16 id, Client *client, ClientEnvironment *env) :
+ ActiveObject(id), m_client(client), m_env(env)
{
}
@@ -38,15 +35,15 @@ ClientActiveObject::~ClientActiveObject()
removeFromScene(true);
}
-ClientActiveObject* ClientActiveObject::create(ActiveObjectType type,
- Client *client, ClientEnvironment *env)
+ClientActiveObject *ClientActiveObject::create(
+ ActiveObjectType type, Client *client, ClientEnvironment *env)
{
// Find factory function
auto n = m_types.find(type);
if (n == m_types.end()) {
// If factory is not found, just return.
- warningstream << "ClientActiveObject: No factory for type="
- << (int)type << std::endl;
+ warningstream << "ClientActiveObject: No factory for type=" << (int)type
+ << std::endl;
return NULL;
}
@@ -62,5 +59,3 @@ void ClientActiveObject::registerType(u16 type, Factory f)
return;
m_types[type] = f;
}
-
-