X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=14f326decf0aedc9781663aac9121029b2746c06;hb=47c58b6b5d40807eee7bd37fa2fd5d2188a333fd;hp=8fa7f5aa794c559cd409a389f1897dbaeb248b55;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp
index 8fa7f5aa7..14f326dec 100644
--- a/src/badguy/mrbomb.hpp
+++ b/src/badguy/mrbomb.hpp
@@ -1,7 +1,7 @@
 //  $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,34 +12,44 @@
 //  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 __MRBOMB_H__
 #define __MRBOMB_H__
 
-#include "badguy.hpp"
+#include "walking_badguy.hpp"
+#include "object/portable.hpp"
 
-class MrBomb : public BadGuy
+class MrBomb : public WalkingBadguy, public Portable
 {
 public:
   MrBomb(const lisp::Lisp& reader);
-  MrBomb(float pos_x, float pos_y, Direction d);
+  MrBomb(const Vector& pos, Direction d);
 
-  void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void kill_fall();
+  HitResponse collision(GameObject& object, const CollisionHit& hit);
+  HitResponse collision_player(Player& player, const CollisionHit& hit);
+
+  void active_update(float elapsed_time);
+
+  void grab(MovingObject& object, const Vector& pos, Direction dir);
+  void ungrab(MovingObject& object, Direction dir);
+  bool is_portable() const;
+
+  void freeze();
+  bool is_freezable() const;
+
+  virtual MrBomb* clone() const { return new MrBomb(*this); }
 
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;  
+  bool collision_squished(GameObject& object);
+
+private:
+  bool grabbed;
 };
 
 #endif
-