X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=dad7103b41fa762a6fb5a83a21225b491fe09b81;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=26b9fcd8011fb445f5dcf994807704dbad7e5b32;hpb=e58a0205a8836820b53a7b875942bae7b0e629fd;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 26b9fcd80..dad7103b4 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -23,12 +23,12 @@
 #include "random_generator.hpp"
 
 static const int SHAKE_RANGE_X = 40;
-static const float SHAKE_TIME = .8;
+static const float SHAKE_TIME = .8f;
 static const float SQUISH_TIME = 2;
 static const float SHAKE_RANGE_Y = 400;
 
 Stalactite::Stalactite(const lisp::Lisp& lisp)
-	: BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite"), state(STALACTITE_HANGING)
+        : BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING)
 {
   countMe = false;
 }
@@ -51,7 +51,7 @@ Stalactite::active_update(float elapsed_time)
       if(player->get_bbox().p2.x > bbox.p1.x - SHAKE_RANGE_X
           && player->get_bbox().p1.x < bbox.p2.x + SHAKE_RANGE_X
           && player->get_bbox().p2.y > bbox.p1.y
-	  && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) {
+          && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) {
         timer.start(SHAKE_TIME);
         state = STALACTITE_SHAKING;
       }
@@ -72,7 +72,7 @@ void
 Stalactite::squish()
 {
   state = STALACTITE_SQUISHED;
-  set_group(COLGROUP_MOVING_ONLY_STATIC);
+  set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
   sprite->set_action("squished");
   if(!timer.started())
     timer.start(SQUISH_TIME);
@@ -99,12 +99,15 @@ Stalactite::collision_player(Player& player)
   return FORCE_MOVE;
 }
 
-HitResponse 
+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);
 
+  // ignore other Stalactites
+  if (dynamic_cast<Stalactite*>(&other)) return FORCE_MOVE;
+
   if (other.is_freezable()) {
     other.freeze();
   } else {
@@ -127,10 +130,16 @@ Stalactite::draw(DrawingContext& context)
   if(get_state() != STATE_ACTIVE)
     return;
 
+
+  if(state == STALACTITE_SQUISHED) {
+    sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    return;
+  }
+
   if(state == STALACTITE_SHAKING) {
-    sprite->draw(context, get_pos() + Vector(systemRandom.rand(-3,3), 0), LAYER_OBJECTS);
+    sprite->draw(context, get_pos() + Vector(systemRandom.rand(-3,3), 0), layer);
   } else {
-    sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    sprite->draw(context, get_pos(), layer);
   }
 }