From 4a789490834157baa8788a2f36c95b86c1e4440e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Mon, 19 Jun 2017 16:49:34 +0200 Subject: Remove IrrlichtDevice unused pointer from ClientActiveObject class & childs (#6010) --- src/content_cao.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/content_cao.cpp') diff --git a/src/content_cao.cpp b/src/content_cao.cpp index ac7b48e0d..e0ebc5fad 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -128,8 +128,7 @@ public: static ClientActiveObject* create(Client *client, ClientEnvironment *env); - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); + void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc); void removeFromScene(bool permanent); void updateLight(u8 light_at_pos); v3s16 getLightPosition(); @@ -165,8 +164,7 @@ ClientActiveObject* TestCAO::create(Client *client, ClientEnvironment *env) return new TestCAO(client, env); } -void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr) +void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc) { if(m_node != NULL) return; @@ -272,8 +270,7 @@ public: static ClientActiveObject* create(Client *client, ClientEnvironment *env); - void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr); + void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc); void removeFromScene(bool permanent); void updateLight(u8 light_at_pos); v3s16 getLightPosition(); @@ -329,8 +326,7 @@ ClientActiveObject* ItemCAO::create(Client *client, ClientEnvironment *env) return new ItemCAO(client, env); } -void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, - IrrlichtDevice *irr) +void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc) { if(m_node != NULL) return; @@ -721,11 +717,9 @@ void GenericCAO::removeFromScene(bool permanent) } } -void GenericCAO::addToScene(scene::ISceneManager *smgr, - ITextureSource *tsrc, IrrlichtDevice *irr) +void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc) { m_smgr = smgr; - m_irr = irr; if (getSceneNode() != NULL) { return; @@ -1034,7 +1028,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) } } - if(m_visuals_expired && m_smgr && m_irr){ + if (m_visuals_expired && m_smgr) { m_visuals_expired = false; // Attachments, part 1: All attached objects must be unparented first, @@ -1056,7 +1050,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) } removeFromScene(false); - addToScene(m_smgr, m_client->tsrc(), m_irr); + addToScene(m_smgr, m_client->tsrc()); // Attachments, part 2: Now that the parent has been refreshed, put its attachments back for (std::vector::size_type i = 0; i < m_children.size(); i++) { -- cgit v1.2.3