merged new collision detection branch back into mainline

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

diff --git a/src/badguy/yeti.hpp b/src/badguy/yeti.hpp
index 30a6744..74d8b19 100644 (file)
--- a/src/badguy/yeti.hpp
+++ b/src/badguy/yeti.hpp
@@ -33,7 +33,7 @@ public:
   void write(lisp::Writer& writer);
   void activate();
   void active_update(float elapsed_time);
-  HitResponse collision_solid(GameObject& object, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   bool collision_squished(Player& player);
   void kill_squished(Player& player);
   void kill_fall();