X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fparticles.h;h=11ccd6218c4c163f0c1b9c7178b9205724942b51;hb=45e9f8081140bfcf45f83508621a94df8f2bce20;hp=9b10afe4b384a03a29abdbafde319c769e146802;hpb=4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f;p=dragonfireclient.git

diff --git a/src/particles.h b/src/particles.h
index 9b10afe4b..11ccd6218 100644
--- a/src/particles.h
+++ b/src/particles.h
@@ -17,14 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef PARTICLES_HEADER
-#define PARTICLES_HEADER
+#pragma once
 
 #include <iostream>
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
 #include "localplayer.h"
-#include "environment.h"
 #include "tileanimation.h"
 
 struct ClientEvent;
@@ -38,7 +36,6 @@ class Particle : public scene::ISceneNode
 	public:
 	Particle(
 		IGameDef* gamedef,
-		scene::ISceneManager* mgr,
 		LocalPlayer *player,
 		ClientEnvironment *env,
 		v3f pos,
@@ -56,7 +53,7 @@ class Particle : public scene::ISceneNode
 		u8 glow,
 		video::SColor color = video::SColor(0xFFFFFFFF)
 	);
-	~Particle();
+	~Particle() = default;
 
 	virtual const aabb3f &getBoundingBox() const
 	{
@@ -119,7 +116,6 @@ class ParticleSpawner
 {
 	public:
 	ParticleSpawner(IGameDef* gamedef,
-		scene::ISceneManager *smgr,
 		LocalPlayer *player,
 		u16 amount,
 		float time,
@@ -137,7 +133,7 @@ class ParticleSpawner
 		const struct TileAnimationParams &anim, u8 glow,
 		ParticleManager* p_manager);
 
-	~ParticleSpawner();
+	~ParticleSpawner() = default;
 
 	void step(float dtime, ClientEnvironment *env);
 
@@ -148,7 +144,6 @@ class ParticleSpawner
 	ParticleManager* m_particlemanager;
 	float m_time;
 	IGameDef *m_gamedef;
-	scene::ISceneManager *m_smgr;
 	LocalPlayer *m_player;
 	u16 m_amount;
 	float m_spawntime;
@@ -185,19 +180,13 @@ friend class ParticleSpawner;
 	void step (float dtime);
 
 	void handleParticleEvent(ClientEvent *event, Client *client,
-			scene::ISceneManager* smgr, LocalPlayer *player);
+			LocalPlayer *player);
 
-	void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-		LocalPlayer *player, v3s16 pos, const MapNode &n,
-		const ContentFeatures &f);
+	void addDiggingParticles(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
+		const MapNode &n, const ContentFeatures &f);
 
-	void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-		LocalPlayer *player, v3s16 pos, const MapNode &n,
-		const ContentFeatures &f);
-
-	void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
-		LocalPlayer *player, v3s16 pos, const MapNode &n,
-		const ContentFeatures &f);
+	void addNodeParticle(IGameDef *gamedef, LocalPlayer *player, v3s16 pos,
+		const MapNode &n, const ContentFeatures &f);
 
 protected:
 	void addParticle(Particle* toadd);
@@ -216,5 +205,3 @@ friend class ParticleSpawner;
 	std::mutex m_particle_list_lock;
 	std::mutex m_spawner_list_lock;
 };
-
-#endif