Removing unused var 'slotfile'

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

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 3622003..84febae 100644 (file)
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -16,23 +16,28 @@
 
 #include "badguy/stalactite.hpp"
 
+#include "audio/sound_manager.hpp"
 #include "math/random_generator.hpp"
+#include "object/bullet.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
 static const int SHAKE_RANGE_X = 40;
 static const float SHAKE_TIME = .8f;
-static const float SQUISH_TIME = 2;
 static const float SHAKE_RANGE_Y = 400;
 
 Stalactite::Stalactite(const Reader& lisp) :
   BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1),
   timer(),
-  state(STALACTITE_HANGING)
+  state(STALACTITE_HANGING),
+  shake_delta()
 {
   countMe = false;
   set_colgroup_active(COLGROUP_TOUCHABLE);
+  SoundManager::current()->preload("sounds/cracking.wav");
+  SoundManager::current()->preload("sounds/sizzle.ogg");
+  SoundManager::current()->preload("sounds/icecrash.ogg");
 }
 
 void
@@ -47,18 +52,18 @@ Stalactite::active_update(float elapsed_time)
          && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) {
         timer.start(SHAKE_TIME);
         state = STALACTITE_SHAKING;
+        SoundManager::current()->play("sounds/cracking.wav", get_pos());
       }
     }
   } else if(state == STALACTITE_SHAKING) {
+    shake_delta = Vector(graphicsRandom.rand(-3,3), 0);
     if(timer.check()) {
       state = STALACTITE_FALLING;
       physic.enable_gravity(true);
       set_colgroup_active(COLGROUP_MOVING);
     }
-  } else if(state == STALACTITE_FALLING || state == STALACTITE_SQUISHED) {
+  } else if(state == STALACTITE_FALLING) {
     movement = physic.get_movement(elapsed_time);
-    if(state == STALACTITE_SQUISHED && timer.check())
-      remove_me();
   }
 }
 
@@ -66,10 +71,14 @@ void
 Stalactite::squish()
 {
   state = STALACTITE_SQUISHED;
-  set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
+  physic.enable_gravity(true);
+  physic.set_velocity_x(0);
+  physic.set_velocity_y(0);
+  set_state(STATE_SQUISHED);
   sprite->set_action("squished");
-  if(!timer.started())
-    timer.start(SQUISH_TIME);
+  SoundManager::current()->play("sounds/icecrash.ogg", get_pos());
+  set_group(COLGROUP_MOVING_ONLY_STATIC);
+  run_dead_script();
 }
 
 void
@@ -109,7 +118,20 @@ Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
     other.kill_fall();
   }
 
-  remove_me();
+  return FORCE_MOVE;
+}
+
+HitResponse
+Stalactite::collision_bullet(Bullet& bullet, const CollisionHit& )
+{
+  if(state == STALACTITE_HANGING) {
+    timer.start(SHAKE_TIME);
+    state = STALACTITE_SHAKING;
+    bullet.remove_me();
+    if(bullet.get_type() == FIRE_BONUS)
+      SoundManager::current()->play("sounds/sizzle.ogg", get_pos());
+    SoundManager::current()->play("sounds/cracking.wav", get_pos());
+  }
 
   return FORCE_MOVE;
 }
@@ -122,16 +144,13 @@ Stalactite::kill_fall()
 void
 Stalactite::draw(DrawingContext& context)
 {
-  if(get_state() != STATE_ACTIVE)
+  if(get_state() == STATE_INIT || get_state() == STATE_INACTIVE)
     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);
+  } else if(state == STALACTITE_SHAKING) {
+    sprite->draw(context, get_pos() + shake_delta, layer);
   } else {
     sprite->draw(context, get_pos(), layer);
   }
@@ -144,6 +163,4 @@ Stalactite::deactivate()
     remove_me();
 }
 
-IMPLEMENT_FACTORY(Stalactite, "stalactite");
-
 /* EOF */