From ee0d3bacbce612c1abc6016cb7b0d684df25b820 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 1 Dec 2011 18:23:58 +0200 Subject: Player-is-SAO WIP --- src/clientobject.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/clientobject.cpp') diff --git a/src/clientobject.cpp b/src/clientobject.cpp index 7dec1903e..93f3b1cca 100644 --- a/src/clientobject.cpp +++ b/src/clientobject.cpp @@ -26,9 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc., ClientActiveObject */ -ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef): +ClientActiveObject::ClientActiveObject(u16 id, IGameDef *gamedef, + ClientEnvironment *env): ActiveObject(id), - m_gamedef(gamedef) + m_gamedef(gamedef), + m_env(env) { } @@ -37,7 +39,8 @@ ClientActiveObject::~ClientActiveObject() removeFromScene(); } -ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef) +ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef, + ClientEnvironment *env) { // Find factory function core::map::Node *n; @@ -51,7 +54,7 @@ ClientActiveObject* ClientActiveObject::create(u8 type, IGameDef *gamedef) } Factory f = n->getValue(); - ClientActiveObject *object = (*f)(gamedef); + ClientActiveObject *object = (*f)(gamedef, env); return object; } -- cgit v1.2.3