From: Ricardo Cruz <rick2@aeiou.pt>
Date: Mon, 20 Sep 2004 19:30:30 +0000 (+0000)
Subject: Bugfix: Don't kill badguys when they are already dying or in a certain mode (bombs... 
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=787176b03edc66b773f6f195681444b365662651;p=supertux.git

Bugfix: Don't kill badguys when they are already dying or in a certain mode (bombs exploding or ticking).
Reported by Frank van der Loo.

SVN-Revision: 1953
---

diff --git a/src/player.cpp b/src/player.cpp
index 533e7613b..87cfc3bf6 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <cassert>
 
-#include "gameloop.h"
 #include "app/globals.h"
 #include "player.h"
 #include "defines.h"
@@ -36,6 +35,7 @@
 #include "interactive_object.h"
 #include "video/screen.h"
 #include "statistics.h"
+#include "gameloop.h"
 
 // behavior definitions:
 #define TILES_FOR_BUTTJUMP 3
@@ -628,12 +628,16 @@ Player::handle_vertical_input()
       BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
       if(badguy)
       {
-        
-	if (fabsf(base.x - badguy->base.x) < 150 &&
-            fabsf(base.y - badguy->base.y) < 60 &&
-            (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
-              issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
-          badguy->kill_me(25);
+        // don't kill when badguys are already dying or in a certain mode
+        if(badguy->dying == DYING_NOT && badguy->mode != BadGuy::BOMB_TICKING &&
+           badguy->mode != BadGuy::BOMB_EXPLODE)
+          {
+            if (fabsf(base.x - badguy->base.x) < 150 &&
+              fabsf(base.y - badguy->base.y) < 60 &&
+              (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+               issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+              badguy->kill_me(25);
+          }
       }
     }
   }