Fixed code that broke due to changes to Rectf and Sizef

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

diff --git a/src/object/skull_tile.hpp b/src/object/skull_tile.hpp
index fc7af6d..cf715ec 100644 (file)
--- a/src/object/skull_tile.hpp
+++ b/src/object/skull_tile.hpp
@@ -1,39 +1,31 @@
-//  $Id: unstable_tile.hpp 2642 2005-06-26 13:38:53Z matzebraun $
-// 
 //  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 __SKULL_TILE_H__
-#define __SKULL_TILE_H__
-
-#include "moving_object.hpp"
-#include "lisp/lisp.hpp"
-#include "physic.hpp"
-#include "timer.hpp"
-
-class Sprite;
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_SKULL_TILE_HPP
+#define HEADER_SUPERTUX_OBJECT_SKULL_TILE_HPP
+
+#include "object/moving_sprite.hpp"
+
 class Player;
 
 /** A tile that starts falling down if tux stands to long on it */
-class SkullTile : public MovingObject
+class SkullTile : public MovingSprite
 {
 public:
-  SkullTile(const lisp::Lisp& lisp);
-  ~SkullTile();
+  SkullTile(const Reader& lisp);
 
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
@@ -41,7 +33,6 @@ public:
 
 private:
   Physic physic;
-  Sprite* sprite;
   Timer timer;
   bool hit;
   bool falling;
@@ -49,3 +40,4 @@ private:
 
 #endif
 
+/* EOF */