[Super-tux-commit] supertux/src badguy.cpp,1.102,1.103

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8083

Modified Files:
	badguy.cpp 
Log Message:
- a couple small fixes

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- badguy.cpp	31 May 2004 22:13:15 -0000	1.102
+++ badguy.cpp	1 Jun 2004 06:58:34 -0000	1.103
@@ -584,7 +584,8 @@
     // 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 @@
 
   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)
     {