fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / object / particlesystem.hpp

diff --git a/src/object/particlesystem.hpp b/src/object/particlesystem.hpp
index 6808b2e..b3f49a5 100644 (file)
--- a/src/object/particlesystem.hpp
+++ b/src/object/particlesystem.hpp
@@ -52,13 +52,13 @@ class DisplayManager;
 class ParticleSystem : public GameObject
 {
 public:
-    ParticleSystem();
+    ParticleSystem(float max_particle_size = 60);
     virtual ~ParticleSystem();
-    
+
     virtual void draw(DrawingContext& context);
 
 protected:
-    enum {MAX_PARTICLE_SIZE = 64};
+    float max_particle_size;
     int z_pos;
 
     class Particle
@@ -70,7 +70,7 @@ protected:
         Vector pos;
         Surface* texture;
     };
-    
+
     std::vector<Particle*> particles;
     float virtual_width, virtual_height;
 };
@@ -88,7 +88,7 @@ public:
 
     std::string type() const
     { return "SnowParticleSystem"; }
-    
+
 private:
     class SnowParticle : public Particle
     {
@@ -96,9 +96,9 @@ private:
         float speed;
        float wobble;
        float anchorx;
-       float anchordrift;
+       float drift_speed;
     };
-    
+
     Surface* snowimages[3];
 };
 
@@ -115,14 +115,14 @@ public:
 
     std::string type() const
     { return "GhostParticleSystem"; }
-    
+
 private:
     class GhostParticle : public Particle
     {
     public:
         float speed;
     };
-    
+
     Surface* ghosts[2];
 };
 
@@ -138,17 +138,16 @@ public:
     virtual void update(float elapsed_time);
 
     std::string type() const
-    { return "CloudParticleSystem"; }    
-    
+    { return "CloudParticleSystem"; }
+
 private:
     class CloudParticle : public Particle
     {
     public:
         float speed;
     };
-    
+
     Surface* cloudimage;
 };
 
 #endif
-