X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.hpp;h=6c20d688b71a1441a81f7ca64d9276832533e736;hb=7831e810062da90ebb745f8e1a4346bc1e80e3ed;hp=99d522a6bed21f408c347863bdab006b6761e164;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp
index 99d522a6b..6c20d688b 100644
--- a/src/object/powerup.hpp
+++ b/src/object/powerup.hpp
@@ -1,46 +1,43 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 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
-//  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 __POWERUP_H__
-#define __POWERUP_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_POWERUP_HPP
+#define HEADER_SUPERTUX_OBJECT_POWERUP_HPP
 
-#include "moving_object.hpp"
-#include "lisp/lisp.hpp"
-#include "sprite/sprite.hpp"
-#include "collision_hit.hpp"
-#include "physic.hpp"
+#include "object/moving_sprite.hpp"
 
-class PowerUp : public MovingObject
+class PowerUp : public MovingSprite
 {
 public:
-  PowerUp(const lisp::Lisp& lisp);
-  ~PowerUp();
+  PowerUp(const Reader& lisp);
+  PowerUp(const Vector& pos, const std::string& sprite_name);
 
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
+  virtual void collision_solid(const CollisionHit& hit);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
-  
+
 private:
-  Sprite* sprite;
   Physic physic;
   std::string script;
+  bool no_physics;
+  Color light;
+  SpritePtr lightsprite;
 };
 
 #endif
 
+/* EOF */