incorporated another patch from Ondra Hosek which fixes tux not getting killed on...

[supertux.git] / src / badguy / badguy.cpp

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index cfa3af2..f95f201 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include "badguy.h"
-#include "camera.h"
+#include "object/camera.h"
 
 static const float SQUISH_TIME = 2;
 static const float X_OFFSCREEN_DISTANCE = 1600;
@@ -25,9 +25,9 @@ BadGuy::draw(DrawingContext& context)
   if(state == STATE_INIT || state == STATE_INACTIVE)
     return;
   if(state == STATE_FALLING) {
-      sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP);
+    sprite->draw(context, get_pos(), LAYER_OBJECTS, VERTICAL_FLIP);
   } else {
-      sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    sprite->draw(context, get_pos(), LAYER_OBJECTS);
   }
 }
 
@@ -97,7 +97,7 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
         return collision_solid(other, hit);
 
       BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
-      if(badguy)
+      if(badguy && badguy->state == STATE_ACTIVE)
         return collision_badguy(*badguy, hit);
 
       Player* player = dynamic_cast<Player*> (&other);
@@ -194,6 +194,9 @@ BadGuy::set_state(State state)
       }
       flags |= FLAG_NO_COLLDET;
       break;
+    case STATE_FALLING:
+      flags |= FLAG_NO_COLLDET;
+      break;
     default:
       break;
   }