merged new collision detection branch back into mainline

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

diff --git a/src/badguy/snowball.hpp b/src/badguy/snowball.hpp
index 49bfa9f..e7387ef 100644 (file)
--- a/src/badguy/snowball.hpp
+++ b/src/badguy/snowball.hpp
@@ -30,7 +30,7 @@ public:
 
   void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
  
   virtual SnowBall* clone() const { return new SnowBall(*this); }