converted ghost forest music to .ogg because of problems playing the mod file

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

diff --git a/src/object/particlesystem.h b/src/object/particlesystem.h
index 4d1f799..ac76ded 100644 (file)
--- a/src/object/particlesystem.h
+++ b/src/object/particlesystem.h
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_PARTICLESYSTEM_H
 #define SUPERTUX_PARTICLESYSTEM_H
 
@@ -25,8 +24,8 @@
 #include "video/surface.h"
 #include "game_object.h"
 #include "serializable.h"
-
-using namespace SuperTux;
+#include "sector.h"
+#include "math/vector.h"
 
 namespace lisp {
 class Lisp;
@@ -40,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.
@@ -83,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"; }
@@ -98,28 +97,28 @@ private:
     Surface* snowimages[3];
 };
 
-class RainParticleSystem : public ParticleSystem, public Serializable
+class GhostParticleSystem : public ParticleSystem, public Serializable
 {
 public:
-    RainParticleSystem();
-    virtual ~RainParticleSystem();
+    GhostParticleSystem();
+    virtual ~GhostParticleSystem();
 
     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 "RainParticleSystem"; }
+    { return "GhostParticleSystem"; }
     
 private:
-    class RainParticle : public Particle
+    class GhostParticle : public Particle
     {
     public:
         float speed;
     };
     
-    Surface* rainimages[2];
+    Surface* ghosts[2];
 };
 
 class CloudParticleSystem : public ParticleSystem, public Serializable
@@ -131,7 +130,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"; }