added a powerup object that can be placed in levels and represent various powerups...

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

diff --git a/src/object/particlesystem.h b/src/object/particlesystem.h
index 526fbdd..05dd9f3 100644 (file)
--- a/src/object/particlesystem.h
+++ b/src/object/particlesystem.h
@@ -24,6 +24,8 @@
 #include "video/surface.h"
 #include "game_object.h"
 #include "serializable.h"
+#include "sector.h"
+#include "math/vector.h"
 
 namespace lisp {
 class Lisp;
@@ -37,7 +39,7 @@ class DisplayManager;
  * layer where it should be drawn and a texture.
  * The coordinate system used here is a virtual one. It would be a bad idea to
  * populate whole levels with particles. So we're using a virtual rectangle
- * here that is tiled onto the level when drawing. This rectangle has the size
+ * here that is tiled onto the level when drawing. This rect.has the size
  * (virtual_width, virtual_height). We're using modulo on the particle
  * coordinates, so when a particle leaves left, it'll reenter at the right
  * side.
@@ -80,7 +82,7 @@ public:
     void parse(const lisp::Lisp& lisp);
     void write(lisp::Writer& writer);
 
-    virtual void action(float elapsed_time);
+    virtual void update(float elapsed_time);
 
     std::string type() const
     { return "SnowParticleSystem"; }
@@ -95,30 +97,6 @@ private:
     Surface* snowimages[3];
 };
 
-class RainParticleSystem : public ParticleSystem, public Serializable
-{
-public:
-    RainParticleSystem();
-    virtual ~RainParticleSystem();
-
-    void parse(const lisp::Lisp& lisp);
-    void write(lisp::Writer& writer);
-
-    virtual void action(float elapsed_time);
-
-    std::string type() const
-    { return "RainParticleSystem"; }
-    
-private:
-    class RainParticle : public Particle
-    {
-    public:
-        float speed;
-    };
-    
-    Surface* rainimages[2];
-};
-
 class CloudParticleSystem : public ParticleSystem, public Serializable
 {
 public:
@@ -128,7 +106,7 @@ public:
     void parse(const lisp::Lisp& lisp);
     void write(lisp::Writer& writer);
 
-    virtual void action(float elapsed_time);
+    virtual void update(float elapsed_time);
 
     std::string type() const
     { return "SnowParticleSystem"; }