Stop dispense_timer on deactivate.

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

diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp
index 92af127..3a0adaf 100644 (file)
--- a/src/badguy/mrbomb.hpp
+++ b/src/badguy/mrbomb.hpp
@@ -20,26 +20,36 @@
 #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 active_update(float elapsed_time);
   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;  
+
+private:
+  bool grabbed;
 };
 
 #endif
-