[Super-tux-commit] supertux/src badguy.cpp,1.35,1.36

[Ricardo C. <rm...@us...>]

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

Modified Files:
	badguy.cpp 
Log Message:
Applied patch from Ryan:
«
This patch causes badguys to be killed when they run into an exploding bomb 
or get hit by stalactite (as suggested by Ricardo).
»

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- badguy.cpp	17 Apr 2004 10:48:04 -0000	1.35
+++ badguy.cpp	17 Apr 2004 12:00:31 -0000	1.36
@@ -973,6 +973,27 @@
           pbad_c->kill_me();
           kill_me();
         }
+
+      /* Kill badguys that run into exploding bomb */
+      else if (kind == BAD_BOMB && dying == DYING_NOT)
+      {
+        if (pbad_c->kind == BAD_MRBOMB)
+        {
+          // FIXME: this is where other MrBombs *should* explode istead of dying
+          pbad_c->kill_me(); 
+        }
+        else if (pbad_c->kind != BAD_BOMB)
+        {
+          pbad_c->kill_me();
+        }
+      }
+
+      /* Kill any badguys that get hit by stalactite */
+      else if (kind == BAD_STALACTITE && dying == DYING_NOT)
+      {
+        pbad_c->kill_me();
+      }
+      
       break;
     }
 }