Removed trailing whitespace from all *.?pp files

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

diff --git a/src/object/particlesystem_interactive.hpp b/src/object/particlesystem_interactive.hpp
index 0b5ade0..b38a7ce 100644 (file)
--- a/src/object/particlesystem_interactive.hpp
+++ b/src/object/particlesystem_interactive.hpp
@@ -20,8 +20,8 @@
 #include "math/vector.hpp"
 #include "supertux/game_object.hpp"
 #include "supertux/sector.hpp"
+#include "video/surface_ptr.hpp"
 
-class Surface;
 class DisplayManager;
 
 /**
@@ -44,13 +44,11 @@ public:
   virtual void draw(DrawingContext& context);
 
 protected:
-  int z_pos;
-
   class Particle
   {
   public:
-    Particle() : 
-      pos(), 
+    Particle() :
+      pos(),
       texture()
     {}
 
@@ -58,67 +56,19 @@ protected:
     {}
 
     Vector pos;
-    Surface* texture;
-  };
-
-  std::vector<Particle*> particles;
-  float virtual_width, virtual_height;
-  int collision(Particle* particle, Vector movement);
-};
-
-class RainParticleSystem : public ParticleSystem_Interactive
-{
-public:
-  RainParticleSystem();
-  virtual ~RainParticleSystem();
-
-  void parse(const Reader& lisp);
-
-  virtual void update(float elapsed_time);
+    SurfacePtr texture;
 
-  std::string type() const
-  { return "RainParticleSystem"; }
-
-private:
-  class RainParticle : public Particle
-  {
-  public:
-    float speed;
+  private:
+    Particle(const Particle&);
+    Particle& operator=(const Particle&);
   };
 
-  Surface* rainimages[2];
-
-private:
-  RainParticleSystem(const RainParticleSystem&);
-  RainParticleSystem& operator=(const RainParticleSystem&);
-};
-
-class CometParticleSystem : public ParticleSystem_Interactive
-{
-public:
-  CometParticleSystem();
-  virtual ~CometParticleSystem();
-
-  void parse(const Reader& lisp);
-  void write(lisp::Writer& writer);
-
-  virtual void update(float elapsed_time);
-
-  std::string type() const
-  { return "CometParticleSystem"; }
-
-private:
-  class CometParticle : public Particle
-  {
-  public:
-    float speed;
-  };
-
-  Surface* cometimages[2];
+  int collision(Particle* particle, Vector movement);
 
-private:
-  CometParticleSystem(const CometParticleSystem&);
-  CometParticleSystem& operator=(const CometParticleSystem&);
+  int z_pos;
+  std::vector<Particle*> particles;
+  float virtual_width;
+  float virtual_height;
 };
 
 #endif