X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=14f326decf0aedc9781663aac9121029b2746c06;hb=2ad3ecbc14b77d373c796ad04d6389489666cc01;hp=63c43649342e5b8c17d41952dec8bfb07843bb66;hpb=ff59adfe9b44e1447ae02a2f9705d695a280059e;p=supertux.git

diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp
index 63c436493..14f326dec 100644
--- a/src/badguy/mrbomb.hpp
+++ b/src/badguy/mrbomb.hpp
@@ -21,8 +21,9 @@
 #define __MRBOMB_H__
 
 #include "walking_badguy.hpp"
+#include "object/portable.hpp"
 
-class MrBomb : public WalkingBadguy
+class MrBomb : public WalkingBadguy, public Portable
 {
 public:
   MrBomb(const lisp::Lisp& reader);
@@ -30,12 +31,25 @@ public:
 
   void write(lisp::Writer& writer);
   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 collision_squished(GameObject& object);
+
+private:
+  bool grabbed;
 };
 
 #endif
-