X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=289135b60a0f2e6184ad03780da430332daa61d9;hb=a3316d68ca17966517c3f7bb0c0cb2b7e612fd0a;hp=f53a944097c4118b0ac4e729d10b43b9f4c32fc4;hpb=2ecc5c71bc6bf4a4877c15c6b6e05faa55947c25;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index f53a94409..289135b60 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -68,13 +68,13 @@ Stalactite::active_update(float elapsed_time)
   }
 }
 
-HitResponse
-Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
+void
+Stalactite::collision_solid(const CollisionHit& hit)
 {
   if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
-    return FORCE_MOVE;
+    return;
   
-  if(hit.normal.y < .9) { // hit floor?
+  if(hit.bottom) { // hit floor?
     state = STALACTITE_SQUISHED;
     set_group(COLGROUP_MOVING_ONLY_STATIC);
     physic.set_velocity_y(0);
@@ -82,12 +82,10 @@ Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
     if(!timer.started())
       timer.start(SQUISH_TIME);
   }
-
-  return CONTINUE;
 }
 
 HitResponse
-Stalactite::collision_player(Player& player, const CollisionHit& )
+Stalactite::collision_player(Player& player)
 {
   if(state != STALACTITE_SQUISHED) {
     player.kill(false);