From: Ryan Flegel <rflegel@gmail.com>
Date: Tue, 1 Jun 2004 06:58:34 +0000 (+0000)
Subject: - a couple small fixes
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2f3e5d1c8316a7022759acdea76d2440b1d5492d;p=supertux.git

- a couple small fixes

SVN-Revision: 1378
---

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 6b61c573c..d2e1a9164 100644
--- 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;
     }
@@ -823,7 +824,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)
     {