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

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

diff --git a/src/object/weak_block.hpp b/src/object/weak_block.hpp
index 01e2464..dedd0a9 100644 (file)
--- a/src/object/weak_block.hpp
+++ b/src/object/weak_block.hpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  SuperTux - Weak Block
 //  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,24 +13,21 @@
 //  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 __WEAK_BLOCK_H__
-#define __WEAK_BLOCK_H__
+#ifndef HEADER_SUPERTUX_OBJECT_WEAK_BLOCK_HPP
+#define HEADER_SUPERTUX_OBJECT_WEAK_BLOCK_HPP
 
 #include "object/moving_sprite.hpp"
-#include "lisp/lisp.hpp"
-#include "physic.hpp"
-#include "timer.hpp"
+#include "supertux/physic.hpp"
 
 /**
  * A block that can be destroyed by Bullet hits
  */
-class WeakBlock : public MovingSprite, public UsesPhysic
+class WeakBlock : public MovingSprite
 {
 public:
-  WeakBlock(const lisp::Lisp& lisp);
+  WeakBlock(const Reader& lisp);
 
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
@@ -58,3 +53,5 @@ private:
 };
 
 #endif
+
+/* EOF */