oops forgot 2 files

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

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index d8e3f4e..03b6742 100644 (file)
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -20,7 +20,7 @@
 
 #include <config.h>
 
-#include "stalactite.h"
+#include "stalactite.hpp"
 
 static const int SHAKE_RANGE = 40;
 static const float SHAKE_TIME = .8;
@@ -33,6 +33,7 @@ Stalactite::Stalactite(const lisp::Lisp& lisp)
   bbox.set_size(31.8, 31.8);
   sprite = sprite_manager->create("stalactite");
   state = STALACTITE_HANGING;
+  countMe = false;
 }
 
 void
@@ -75,6 +76,7 @@ Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
   
   if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
     state = STALACTITE_SQUISHED;
+    set_group(COLGROUP_MOVING_ONLY_STATIC);
     physic.set_velocity_y(0);
     sprite->set_action("squished");
     if(!timer.started())