merged new collision detection branch back into mainline

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

diff --git a/src/badguy/kugelblitz.hpp b/src/badguy/kugelblitz.hpp
index a9c64ba..2e7b3ee 100644 (file)
--- a/src/badguy/kugelblitz.hpp
+++ b/src/badguy/kugelblitz.hpp
@@ -31,7 +31,7 @@ public:
 
   void activate();
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
   void write(lisp::Writer& writer);