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 991fff7..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;
 
 /**
@@ -47,8 +47,8 @@ protected:
   class Particle
   {
   public:
-    Particle() : 
-      pos(), 
+    Particle() :
+      pos(),
       texture()
     {}
 
@@ -56,7 +56,11 @@ protected:
     {}
 
     Vector pos;
-    Surface* texture;
+    SurfacePtr texture;
+
+  private:
+    Particle(const Particle&);
+    Particle& operator=(const Particle&);
   };
 
   int collision(Particle* particle, Vector movement);
@@ -67,69 +71,6 @@ protected:
   float virtual_height;
 };
 
-class RainParticleSystem : public ParticleSystem_Interactive
-{
-public:
-  RainParticleSystem();
-  virtual ~RainParticleSystem();
-
-  void parse(const Reader& lisp);
-
-  virtual void update(float elapsed_time);
-
-  std::string type() const
-  { return "RainParticleSystem"; }
-
-private:
-  class RainParticle : public Particle
-  {
-  public:
-    float speed;
-
-    RainParticle() : 
-      speed()
-    {}
-  };
-
-  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;
-
-    CometParticle() :
-      speed()
-    {}
-  };
-
-  Surface* cometimages[2];
-
-private:
-  CometParticleSystem(const CometParticleSystem&);
-  CometParticleSystem& operator=(const CometParticleSystem&);
-};
-
 #endif
 
 /* EOF */