Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/object/unstable_tile.hpp b/src/object/unstable_tile.hpp
index a6bb71e..4c2cf17 100644 (file)
--- a/src/object/unstable_tile.hpp
+++ b/src/object/unstable_tile.hpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  SuperTux - Unstable Tile
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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
@@ -15,25 +13,22 @@
 //  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 __UNSTABLE_TILE_H__
-#define __UNSTABLE_TILE_H__
+#ifndef HEADER_SUPERTUX_OBJECT_UNSTABLE_TILE_HPP
+#define HEADER_SUPERTUX_OBJECT_UNSTABLE_TILE_HPP
 
 #include "object/moving_sprite.hpp"
-#include "lisp/lisp.hpp"
-#include "physic.hpp"
-#include "timer.hpp"
+#include "supertux/physic.hpp"
+#include "supertux/timer.hpp"
 
 /**
  * A block that disintegrates when stood on
  */
-class UnstableTile : public MovingSprite, public UsesPhysic
+class UnstableTile : public MovingSprite
 {
 public:
-  UnstableTile(const lisp::Lisp& lisp);
-  virtual UnstableTile* clone() const { return new UnstableTile(*this); }
+  UnstableTile(const Reader& lisp);
 
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
@@ -44,7 +39,12 @@ private:
     STATE_CRUMBLING,     /**< crumbling, still solid */
     STATE_DISINTEGRATING /**< disintegrating, no longer solid */
   };
+
+private:
+  Physic physic;
   State state;
 };
 
 #endif
+
+/* EOF */