X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpowerup.hpp;h=4779db17063ab1fb97d6078b67a71a1304c5f6c4;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=f7b6567723b96888187ef8087c3553f6e9dfdb61;hpb=b158cdbc7139bcc35fd4c37a5cf640bf9f744998;p=supertux.git

diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp
index f7b656772..4779db170 100644
--- a/src/object/powerup.hpp
+++ b/src/object/powerup.hpp
@@ -1,7 +1,7 @@
 //  $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
@@ -12,37 +12,31 @@
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #ifndef __POWERUP_H__
 #define __POWERUP_H__
 
-#include "moving_object.hpp"
+#include "object/moving_sprite.hpp"
 #include "lisp/lisp.hpp"
-#include "sprite/sprite.hpp"
 #include "collision_hit.hpp"
 #include "physic.hpp"
 
-class PowerUp : public MovingObject
+class PowerUp : public MovingSprite, private UsesPhysic
 {
 public:
   PowerUp(const lisp::Lisp& lisp);
-  ~PowerUp();
 
   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:
-  std::string sprite_name;
-  Sprite* sprite;
-  Physic physic;
   std::string script;
   bool no_physics;
 };
 
 #endif
-