X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.hpp;h=bca1be0fd373560b5bb50fe390a2133e65599786;hb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;hp=4779db17063ab1fb97d6078b67a71a1304c5f6c4;hpb=f406067af6cbeb0a638078fe1d386d092583909c;p=supertux.git

diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp
index 4779db170..bca1be0fd 100644
--- a/src/object/powerup.hpp
+++ b/src/object/powerup.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
@@ -14,29 +12,28 @@
 //  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 __POWERUP_H__
-#define __POWERUP_H__
+#ifndef HEADER_SUPERTUX_OBJECT_POWERUP_HPP
+#define HEADER_SUPERTUX_OBJECT_POWERUP_HPP
 
 #include "object/moving_sprite.hpp"
-#include "lisp/lisp.hpp"
-#include "collision_hit.hpp"
-#include "physic.hpp"
 
-class PowerUp : public MovingSprite, private UsesPhysic
+class PowerUp : public MovingSprite
 {
 public:
-  PowerUp(const lisp::Lisp& lisp);
+  PowerUp(const Reader& lisp);
 
   virtual void update(float elapsed_time);
   virtual void collision_solid(const CollisionHit& hit);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
 private:
+  Physic physic;
   std::string script;
   bool no_physics;
 };
 
 #endif
+
+/* EOF */