- fix a bunch of msvc warnings (mostly assigning double constants to float variables)

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

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 26b9fcd..6117e2d 100644 (file)
--- 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;
 }
@@ -105,6 +105,9 @@ 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);
   }
 }