Stalactites interact with badguys again.

[supertux.git] / src / badguy / stalactite.cpp

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index c0fd7be..26b9fcd 100644 (file)
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -69,18 +69,23 @@ Stalactite::active_update(float elapsed_time)
 }
 
 void
-Stalactite::collision_solid(const CollisionHit& hit)
+Stalactite::squish()
 {
-  if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
-    return;
+  state = STALACTITE_SQUISHED;
+  set_group(COLGROUP_MOVING_ONLY_STATIC);
+  sprite->set_action("squished");
+  if(!timer.started())
+    timer.start(SQUISH_TIME);
+}
 
-  if(hit.bottom) { // hit floor?
-    state = STALACTITE_SQUISHED;
-    set_group(COLGROUP_MOVING_ONLY_STATIC);
+void
+Stalactite::collision_solid(const CollisionHit& hit)
+{
+  if(state == STALACTITE_FALLING) {
+    if (hit.bottom) squish();
+  }
+  if(state == STALACTITE_SQUISHED) {
     physic.set_velocity_y(0);
-    sprite->set_action("squished");
-    if(!timer.started())
-      timer.start(SQUISH_TIME);
   }
 }
 
@@ -94,6 +99,23 @@ Stalactite::collision_player(Player& player)
   return FORCE_MOVE;
 }
 
+HitResponse 
+Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
+{
+  if (state == STALACTITE_SQUISHED) return FORCE_MOVE;
+  if (state != STALACTITE_FALLING) return BadGuy::collision_badguy(other, hit);
+
+  if (other.is_freezable()) {
+    other.freeze();
+  } else {
+    other.kill_fall();
+  }
+
+  remove_me();
+
+  return FORCE_MOVE;
+}
+
 void
 Stalactite::kill_fall()
 {