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.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/clientobject.h') diff --git a/src/clientobject.h b/src/clientobject.h index 0b3d8623a..2e1b850c7 100644 --- a/src/clientobject.h +++ b/src/clientobject.h @@ -42,10 +42,11 @@ class IGameDef; class ClientActiveObject : public ActiveObject { public: - ClientActiveObject(u16 id, IGameDef *gamedef); + ClientActiveObject(u16 id, IGameDef *gamedef, ClientEnvironment *env); virtual ~ClientActiveObject(); - virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc){} + virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, + IrrlichtDevice *irr){} virtual void removeFromScene(){} // 0 <= light_at_pos <= LIGHT_SUN virtual void updateLight(u8 light_at_pos){} @@ -70,7 +71,8 @@ public: virtual void initialize(const std::string &data){} // Create a certain type of ClientActiveObject - static ClientActiveObject* create(u8 type, IGameDef *gamedef); + static ClientActiveObject* create(u8 type, IGameDef *gamedef, + ClientEnvironment *env); // If returns true, punch will not be sent to the server virtual bool directReportPunch(const std::string &toolname, v3f dir) @@ -78,9 +80,10 @@ public: protected: // Used for creating objects based on type - typedef ClientActiveObject* (*Factory)(IGameDef *gamedef); + typedef ClientActiveObject* (*Factory)(IGameDef *gamedef, ClientEnvironment *env); static void registerType(u16 type, Factory f); IGameDef *m_gamedef; + ClientEnvironment *m_env; private: // Used for creating objects based on type static core::map m_types; -- cgit v1.2.3