X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem_interactive.hpp;h=b38a7ce1b5c24272457940b4749f11ccc5bd36c4;hb=d794aac09d4a3b3f5f93985cd74381bb4de4ce84;hp=b7d841176e8a2d1a6ef9ad5eac4379921a454af7;hpb=18c69f4aa24d496f84a088d60c18b180c293dace;p=supertux.git

diff --git a/src/object/particlesystem_interactive.hpp b/src/object/particlesystem_interactive.hpp
index b7d841176..b38a7ce1b 100644
--- 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,7 @@ protected:
     {}
 
     Vector pos;
-    Surface* texture;
+    SurfacePtr texture;
 
   private:
     Particle(const Particle&);
@@ -71,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(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 */