diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/clientobject.cpp | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/clientobject.cpp')
| -rw-r--r-- | src/clientobject.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp index ff3f47187..89a0474a4 100644 --- a/src/clientobject.cpp +++ b/src/clientobject.cpp @@ -20,16 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "clientobject.h" #include "debug.h" #include "porting.h" -#include "constants.h" /* ClientActiveObject */ -ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef, +ClientActiveObject::ClientActiveObject(u16 id, Client *client, ClientEnvironment *env): ActiveObject(id), - m_gamedef(gamedef), + m_client(client), m_env(env) { } @@ -40,7 +39,7 @@ ClientActiveObject::~ClientActiveObject() } ClientActiveObject* ClientActiveObject::create(ActiveObjectType type, - IGameDef *gamedef, ClientEnvironment *env) + Client *client, ClientEnvironment *env) { // Find factory function UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type); @@ -52,7 +51,7 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type, } Factory f = n->second; - ClientActiveObject *object = (*f)(gamedef, env); + ClientActiveObject *object = (*f)(client, env); return object; } |