merged new collision detection branch back into mainline

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

diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp
index 6e49d0b..5aa053a 100644 (file)
--- a/src/badguy/mrbomb.hpp
+++ b/src/badguy/mrbomb.hpp
@@ -31,8 +31,8 @@ public:
   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 collision_solid(const CollisionHit& hit);
+  HitResponse collision_badguy(BadGuy& badguy);
   void kill_fall();
 
   virtual MrBomb* clone() const { return new MrBomb(*this); }