merged new collision detection branch back into mainline

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

diff --git a/src/badguy/bomb.hpp b/src/badguy/bomb.hpp
index 94d7159..40b29d0 100644 (file)
--- a/src/badguy/bomb.hpp
+++ b/src/badguy/bomb.hpp
@@ -29,15 +29,13 @@ public:
   Bomb(const Bomb& bomb);
 
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
   void kill_fall();
   void explode();
 
-  virtual Bomb* clone() const { return new Bomb(*this); }
-
 private:
   enum State {
     STATE_TICKING,
@@ -47,7 +45,6 @@ private:
   State state;
 
   std::auto_ptr<SoundSource> ticking;
-
 };
 
 #endif