* Add Airship (regular above-ground theme) and Battle (castle/boss theme) music court...

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

diff --git a/src/object/particlesystem_interactive.hpp b/src/object/particlesystem_interactive.hpp
index e291053..55bf3c5 100644 (file)
--- a/src/object/particlesystem_interactive.hpp
+++ b/src/object/particlesystem_interactive.hpp
@@ -1,7 +1,7 @@
-//  $Id: ParticleSystem_Interactive.h 2462 2005-05-10 15:38:16Z wansti $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,10 +12,11 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  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_INTERACTIVE_H
 #define SUPERTUX_PARTICLESYSTEM_INTERACTIVE_H
 
@@ -49,11 +50,11 @@ class ParticleSystem_Interactive : public GameObject
 public:
     ParticleSystem_Interactive();
     virtual ~ParticleSystem_Interactive();
-    
+
     virtual void draw(DrawingContext& context);
 
 protected:
-    int layer;
+    int z_pos;
 
     class Particle
     {
@@ -64,7 +65,7 @@ protected:
         Vector pos;
         Surface* texture;
     };
-    
+
     std::vector<Particle*> particles;
     float virtual_width, virtual_height;
     int collision(Particle* particle, Vector movement);
@@ -83,14 +84,14 @@ public:
 
     std::string type() const
     { return "RainParticleSystem"; }
-    
+
 private:
     class RainParticle : public Particle
     {
     public:
         float speed;
     };
-    
+
     Surface* rainimages[2];
 };
 
@@ -107,16 +108,15 @@ public:
 
     std::string type() const
     { return "CometParticleSystem"; }
-    
+
 private:
     class CometParticle : public Particle
     {
     public:
         float speed;
     };
-    
+
     Surface* cometimages[2];
 };
 
 #endif
-