Stalactites break free when disturbed by fire and ice bullets

SuperTux · Sep 6, 2013 · 450b140 · 450b140
1 parent a84a337
commit 450b140
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
@@ -17,6 +17,7 @@
 #include "badguy/stalactite.hpp"
 
 #include "math/random_generator.hpp"
+#include "object/bullet.hpp"
 #include "object/player.hpp"
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
@@ -114,6 +115,18 @@ Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
   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();
+  }
+
+  return FORCE_MOVE;
+}
+
 void
 Stalactite::kill_fall()
 {

diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp
@@ -28,6 +28,7 @@ class Stalactite : public BadGuy
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit);
+  HitResponse collision_bullet(Bullet& bullet, const CollisionHit& );
 
   void kill_fall();
   void draw(DrawingContext& context);