Bug 456: Avoid hurting Tux in a ravine.

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

diff --git a/src/object/particles.hpp b/src/object/particles.hpp
index cc3738e..8582665 100644 (file)
--- a/src/object/particles.hpp
+++ b/src/object/particles.hpp
@@ -1,29 +1,25 @@
-//  $Id: gameobjs.hpp 2806 2005-10-03 15:29:22Z matzebraun $
-// 
 //  SuperTux
-//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
-//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  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_PARTICLES_HPP
-#define SUPERTUX_PARTICLES_HPP
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_PARTICLES_HPP
+#define HEADER_SUPERTUX_OBJECT_PARTICLES_HPP
 
 #include "math/vector.hpp"
-#include "game_object.hpp"
-#include "timer.hpp"
+#include "supertux/game_object.hpp"
+#include "supertux/timer.hpp"
 #include "video/color.hpp"
 
 class Particles : public GameObject
@@ -34,11 +30,22 @@ public:
             int number, Color color, int size, float life_time,
             int drawing_layer);
   ~Particles();
-  
+
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
 private:
+  struct Particle {
+    Vector pos, vel;
+
+    Particle() : 
+      pos(), 
+      vel()
+    {}
+    //     float angle;
+  };
+
+private:
   Vector accel;
   Timer timer;
   bool live_forever;
@@ -47,11 +54,9 @@ private:
   float size;
   int drawing_layer;
 
-  struct Particle {
-    Vector pos, vel;
-//     float angle;
-    };
   std::vector <Particle*> particles;
 };
 
 #endif
+
+/* EOF */