X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fexplosion.hpp;h=3e46ef4533262430336f95ac71613252aff5b31c;hb=64842a0700a2ee8a3d2d61ad2685217f5060985a;hp=4ae40e424a6d6ca2bd90d5dd2c3b9c82b958c8fd;hpb=fea3446f05e1e7673607b835c269d3e8d1929ab3;p=supertux.git

diff --git a/src/object/explosion.hpp b/src/object/explosion.hpp
index 4ae40e424..3e46ef453 100644
--- a/src/object/explosion.hpp
+++ b/src/object/explosion.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux -- Explosion object
 //  Copyright (C) 2007 Christoph Sommer <christoph.sommer@2007.expires.deltadevelopment.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
@@ -14,14 +12,12 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __EXPLOSION_H__
-#define __EXPLOSION_H__
+#ifndef HEADER_SUPERTUX_OBJECT_EXPLOSION_HPP
+#define HEADER_SUPERTUX_OBJECT_EXPLOSION_HPP
 
-#include "moving_sprite.hpp"
-#include "lisp/lisp.hpp"
+#include "object/moving_sprite.hpp"
 
 /**
  * Just your average explosion - goes boom, hurts Tux
@@ -33,11 +29,32 @@ public:
    * Create new Explosion centered(!) at @c pos
    */
   Explosion(const Vector& pos);
-  Explosion(const lisp::Lisp& reader);
+  Explosion(const Reader& reader);
 
   void update(float elapsed_time);
+  void draw(DrawingContext& context);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
+  bool hurts (void) const
+  {
+    return this->hurt;
+  }
+
+  void hurts (bool val)
+  {
+    this->hurt = val;
+  }
+
+  bool pushes (void) const
+  {
+    return this->push;
+  }
+
+  void pushes (bool val)
+  {
+    this->push = val;
+  }
+
 protected:
   /**
    * plays sound, starts animation
@@ -49,9 +66,14 @@ private:
     STATE_WAITING,
     STATE_EXPLODING
   };
+  bool hurt;
+  bool push;
   State state;
+  Color light;
+  SpritePtr lightsprite;
 
 };
 
 #endif
 
+/* EOF */