* Finish work on Path through the Clouds

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

diff --git a/src/object/skull_tile.hpp b/src/object/skull_tile.hpp
index fc7af6d..50c38e3 100644 (file)
--- a/src/object/skull_tile.hpp
+++ b/src/object/skull_tile.hpp
@@ -1,7 +1,7 @@
-//  $Id: unstable_tile.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
+//  $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,40 +12,35 @@
 //  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 __SKULL_TILE_H__
 #define __SKULL_TILE_H__
 
-#include "moving_object.hpp"
-#include "lisp/lisp.hpp"
+#include "object/moving_sprite.hpp"
 #include "physic.hpp"
 #include "timer.hpp"
 
-class Sprite;
 class Player;
 
 /** A tile that starts falling down if tux stands to long on it */
-class SkullTile : public MovingObject
+class SkullTile : public MovingSprite, private UsesPhysic
 {
 public:
   SkullTile(const lisp::Lisp& lisp);
-  ~SkullTile();
+  virtual SkullTile* clone() const { return new SkullTile(*this); }
 
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
   void draw(DrawingContext& context);
 
 private:
-  Physic physic;
-  Sprite* sprite;
   Timer timer;
   bool hit;
   bool falling;
 };
 
 #endif
-