Remove IrrlichtDevice unused pointer from ClientActiveObject class & childs (#6010)

nerzhul · web-flow · commit 4a7894908341 · 2017-06-19T16:49:34.000+02:00
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
@@ -458,7 +458,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 	infostream<<"ClientEnvironment::addActiveObject(): "
 		<<"added (id="<<object->getId()<<")"<<std::endl;
 	m_active_objects[object->getId()] = object;
-	object->addToScene(m_smgr, m_texturesource, m_irr);
+	object->addToScene(m_smgr, m_texturesource);
 	{ // Update lighting immediately
 		u8 light = 0;
 		bool pos_ok;
diff --git a/src/clientobject.h b/src/clientobject.h
@@ -39,9 +39,8 @@ class ClientActiveObject : public ActiveObject
 	ClientActiveObject(u16 id, Client *client, ClientEnvironment *env);
 	virtual ~ClientActiveObject();
 
-	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr){}
-	virtual void removeFromScene(bool permanent){}
+	virtual void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc) {};
+	virtual void removeFromScene(bool permanent) {}
 	// 0 <= light_at_pos <= LIGHT_SUN
 	virtual void updateLight(u8 light_at_pos){}
 	virtual void updateLightNoCheck(u8 light_at_pos){}
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -128,8 +128,7 @@ class TestCAO : public ClientActiveObject
 
 	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 @@ class ItemCAO : public ClientActiveObject
 
 	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<u16>::size_type i = 0; i < m_children.size(); i++) {
diff --git a/src/content_cao.h b/src/content_cao.h
@@ -65,7 +65,6 @@ class GenericCAO : public ClientActiveObject
 	ObjectProperties m_prop;
 	//
 	scene::ISceneManager *m_smgr = nullptr;
-	IrrlichtDevice *m_irr = nullptr;
 	Client *m_client = nullptr;
 	aabb3f m_selection_box = aabb3f(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.);
 	scene::IMeshSceneNode *m_meshnode = nullptr;
@@ -169,8 +168,7 @@ class GenericCAO : public ClientActiveObject
 
 	void removeFromScene(bool permanent);
 
-	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
-			IrrlichtDevice *irr);
+	void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc);
 
 	inline void expireVisuals()
 	{

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ class TestCAO : public ClientActiveObject`
`128`	`128`
`129`	`129`	`static ClientActiveObject* create(Client client, ClientEnvironment env);`
`130`	`130`
`131`		`- void addToScene(scene::ISceneManager smgr, ITextureSource tsrc,`
`132`		`- IrrlichtDevice *irr);`
	`131`	`+ void addToScene(scene::ISceneManager smgr, ITextureSource tsrc);`
`133`	`132`	`void removeFromScene(bool permanent);`
`134`	`133`	`void updateLight(u8 light_at_pos);`
`135`	`134`	`v3s16 getLightPosition();`
`@@ -165,8 +164,7 @@ ClientActiveObject* TestCAO::create(Client client, ClientEnvironment env)`
`165`	`164`	`return new TestCAO(client, env);`
`166`	`165`	`}`
`167`	`166`
`168`		`-void TestCAO::addToScene(scene::ISceneManager smgr, ITextureSource tsrc,`
`169`		`- IrrlichtDevice *irr)`
	`167`	`+void TestCAO::addToScene(scene::ISceneManager smgr, ITextureSource tsrc)`
`170`	`168`	`{`
`171`	`169`	`if(m_node != NULL)`
`172`	`170`	`return;`
`@@ -272,8 +270,7 @@ class ItemCAO : public ClientActiveObject`
`272`	`270`
`273`	`271`	`static ClientActiveObject* create(Client client, ClientEnvironment env);`
`274`	`272`
`275`		`- void addToScene(scene::ISceneManager smgr, ITextureSource tsrc,`
`276`		`- IrrlichtDevice *irr);`
	`273`	`+ void addToScene(scene::ISceneManager smgr, ITextureSource tsrc);`
`277`	`274`	`void removeFromScene(bool permanent);`
`278`	`275`	`void updateLight(u8 light_at_pos);`
`279`	`276`	`v3s16 getLightPosition();`
`@@ -329,8 +326,7 @@ ClientActiveObject* ItemCAO::create(Client client, ClientEnvironment env)`
`329`	`326`	`return new ItemCAO(client, env);`
`330`	`327`	`}`
`331`	`328`
`332`		`-void ItemCAO::addToScene(scene::ISceneManager smgr, ITextureSource tsrc,`
`333`		`- IrrlichtDevice *irr)`
	`329`	`+void ItemCAO::addToScene(scene::ISceneManager smgr, ITextureSource tsrc)`
`334`	`330`	`{`
`335`	`331`	`if(m_node != NULL)`
`336`	`332`	`return;`
`@@ -721,11 +717,9 @@ void GenericCAO::removeFromScene(bool permanent)`
`721`	`717`	`}`
`722`	`718`	`}`
`723`	`719`
`724`		`-void GenericCAO::addToScene(scene::ISceneManager *smgr,`
`725`		`- ITextureSource tsrc, IrrlichtDevice irr)`
	`720`	`+void GenericCAO::addToScene(scene::ISceneManager smgr, ITextureSource tsrc)`
`726`	`721`	`{`
`727`	`722`	`m_smgr = smgr;`
`728`		`- m_irr = irr;`
`729`	`723`
`730`	`724`	`if (getSceneNode() != NULL) {`
`731`	`725`	`return;`
`@@ -1034,7 +1028,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)`
`1034`	`1028`	`}`
`1035`	`1029`	`}`
`1036`	`1030`
`1037`		`- if(m_visuals_expired && m_smgr && m_irr){`
	`1031`	`+ if (m_visuals_expired && m_smgr) {`
`1038`	`1032`	`m_visuals_expired = false;`
`1039`	`1033`
`1040`	`1034`	`// Attachments, part 1: All attached objects must be unparented first,`
`@@ -1056,7 +1050,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)`
`1056`	`1050`	`}`
`1057`	`1051`
`1058`	`1052`	`removeFromScene(false);`
`1059`		`- addToScene(m_smgr, m_client->tsrc(), m_irr);`
	`1053`	`+ addToScene(m_smgr, m_client->tsrc());`
`1060`	`1054`
`1061`	`1055`	`// Attachments, part 2: Now that the parent has been refreshed, put its attachments back`
`1062`	`1056`	`for (std::vector<u16>::size_type i = 0; i < m_children.size(); i++) {`