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

[supertux.git] / src / badguy / mrbomb.hpp

diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp
index 14f326d..4ad45f3 100644 (file)
--- a/src/badguy/mrbomb.hpp
+++ b/src/badguy/mrbomb.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
@@ -14,22 +12,20 @@
 //  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 __MRBOMB_H__
-#define __MRBOMB_H__
+#ifndef HEADER_SUPERTUX_BADGUY_MRBOMB_HPP
+#define HEADER_SUPERTUX_BADGUY_MRBOMB_HPP
 
-#include "walking_badguy.hpp"
-#include "object/portable.hpp"
+#include "badguy/walking_badguy.hpp"
 
-class MrBomb : public WalkingBadguy, public Portable
+class MrBomb : public WalkingBadguy, 
+               public Portable
 {
 public:
-  MrBomb(const lisp::Lisp& reader);
+  MrBomb(const Reader& reader);
   MrBomb(const Vector& pos, Direction d);
 
-  void write(lisp::Writer& writer);
   void kill_fall();
   HitResponse collision(GameObject& object, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
@@ -43,8 +39,6 @@ public:
   void freeze();
   bool is_freezable() const;
 
-  virtual MrBomb* clone() const { return new MrBomb(*this); }
-
 protected:
   bool collision_squished(GameObject& object);
 
@@ -53,3 +47,5 @@ private:
 };
 
 #endif
+
+/* EOF */