merged new collision detection branch back into mainline

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

diff --git a/src/badguy/rocketexplosion.hpp b/src/badguy/rocketexplosion.hpp
index c76a6b8..ef09d17 100644 (file)
--- a/src/badguy/rocketexplosion.hpp
+++ b/src/badguy/rocketexplosion.hpp
@@ -28,7 +28,6 @@ public:
   RocketExplosion(const Vector& pos, Direction dir);
 
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, 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);