Cleanup in content_mapblock (#5746)

[oweals/minetest.git] / src / particles.h

diff --git a/src/particles.h b/src/particles.h
index 5464e66722c9a41dded0e62af1aa472958041fe4..eaec1f0fa784a4d942bc973875f9d24c10e7e1c5 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -20,8 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PARTICLES_HEADER
 #define PARTICLES_HEADER
 
-#define DIGGING_PARTICLES_AMOUNT 10
-
 #include <iostream>
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
@@ -32,6 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 struct ClientEvent;
 class ParticleManager;
 class ClientEnvironment;
+struct MapNode;
+struct ContentFeatures;
 
 class Particle : public scene::ISceneNode
 {
@@ -53,7 +53,8 @@ class Particle : public scene::ISceneNode
                v2f texpos,
                v2f texsize,
                const struct TileAnimationParams &anim,
-               u8 glow
+               u8 glow,
+               video::SColor color = video::SColor(0xFFFFFFFF)
        );
        ~Particle();
 
@@ -100,7 +101,10 @@ private:
        v3f m_acceleration;
        LocalPlayer *m_player;
        float m_size;
-       u8 m_light;
+       //! Color without lighting
+       video::SColor m_base_color;
+       //! Final rendered color
+       video::SColor m_color;
        bool m_collisiondetection;
        bool m_collision_removal;
        bool m_vertical;
@@ -184,13 +188,16 @@ public:
                        scene::ISceneManager* smgr, LocalPlayer *player);
 
        void addDiggingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
        void addPunchingParticles(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
        void addNodeParticle(IGameDef* gamedef, scene::ISceneManager* smgr,
-               LocalPlayer *player, v3s16 pos, const TileSpec tiles[]);
+               LocalPlayer *player, v3s16 pos, const MapNode &n,
+               const ContentFeatures &f);
 
 protected:
        void addParticle(Particle* toadd);