X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=f810d7c0d12a0037ea5b28eb6de56a0827f5dfed;hb=2ad3ecbc14b77d373c796ad04d6389489666cc01;hp=6a3d67578fbe25f3194a2cd1974eb7562450c8f2;hpb=65a0b6f7ec1123cff959e13e1a4919dc70fe4e85;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 6a3d67578..f810d7c0d 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -20,7 +20,12 @@
 #include <config.h>
 
 #include "stalactite.hpp"
+
 #include "random_generator.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
 
 static const int SHAKE_RANGE_X = 40;
 static const float SHAKE_TIME = .8f;
@@ -31,6 +36,7 @@ Stalactite::Stalactite(const lisp::Lisp& lisp)
         : BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING)
 {
   countMe = false;
+  set_colgroup_active(COLGROUP_TOUCHABLE);
 }
 
 void
@@ -60,6 +66,7 @@ Stalactite::active_update(float elapsed_time)
     if(timer.check()) {
       state = STALACTITE_FALLING;
       physic.enable_gravity(true);
+      set_colgroup_active(COLGROUP_MOVING);
     }
   } else if(state == STALACTITE_FALLING || state == STALACTITE_SQUISHED) {
     movement = physic.get_movement(elapsed_time);
@@ -103,11 +110,12 @@ 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 (state != STALACTITE_FALLING) return BadGuy::collision_badguy(other, hit);
+
   if (other.is_freezable()) {
     other.freeze();
   } else {