- updated TODO

[supertux.git] / src / badguy.cpp

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 6b61c57..6d1015d 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -584,7 +584,8 @@ BadGuy::action_stalactite(double elapsed_time)
     // start shaking when tux is below the stalactite and at least 40 pixels
     // near
     if(tux.base.x + 32 > base.x - RANGE && tux.base.x < base.x + 32 + RANGE
-            && tux.base.y + tux.base.height > base.y) {
+            && tux.base.y + tux.base.height > base.y
+            && tux.dying == DYING_NOT) {
       timer.start(SHAKETIME);
       mode = STALACTITE_SHAKING;
     }
@@ -643,7 +644,8 @@ BadGuy::action_fish(double elapsed_time)
     
   // go in wait mode when back in water
   if(dying == DYING_NOT 
-      && gettile(base.x, base.y+ base.height)->attributes & Tile::WATER
+      && gettile(base.x, base.y + base.height)
+      && gettile(base.x, base.y + base.height)->attributes & Tile::WATER
       && physic.get_velocity_y() <= 0 && mode == NORMAL)
     {
       mode = FISH_WAIT;
@@ -823,7 +825,7 @@ BadGuy::action_walkingtree(double elapsed_time)
 
   fall();
 
-  if (mode == BGM_BIG)
+  if (mode == BGM_BIG && tux.dying == DYING_NOT)
   {
     if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT)
     {