fixed a bug, added some debug messages

SVN-Revision: 2358

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 1c1f581..8b61863 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -146,6 +146,7 @@ BadGuy::collision_player(Player& player, const CollisionHit& hit)
       return FORCE_MOVE;
     }
   }
+  std::cout << "COLLISION - HITPOINTS: " << hitpoints << ", BULLLET HP: " << bullet_hitpoints << std::endl;
   player.kill(Player::SHRINK);
   return FORCE_MOVE;
 }
@@ -179,12 +180,14 @@ BadGuy::kill_fall()
 {
   bullet_hitpoints--;
   if (bullet_hitpoints <= 0) {
+    hitpoints = 0;
     SoundManager::get()->play_sound(IDToSound(SND_FALL), this,
        Sector::current()->player->get_pos());
     physic.set_velocity_y(0);
     physic.enable_gravity(true);
     set_state(STATE_FALLING);
   }
+  std::cout << "KILL_FALL - HITPOINTS: " << hitpoints << ", BULLLET HP: " << bullet_hitpoints << std::endl;
 }
 
 void

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 933a5d1..b0798f4 100644 (file)
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -121,6 +121,7 @@ Nolok_01::kill_fall()
 {
   bullet_hitpoints--;
   if (bullet_hitpoints <= 0) {
+   hitpoints = 0;
    SoundManager::get()->play_sound(IDToSound(SND_FALL), this,
          Sector::current()->player->get_pos());
    physic.set_velocity_y(0);
@@ -128,6 +129,7 @@ Nolok_01::kill_fall()
    set_state(STATE_FALLING);
    Sector::current()->add_object(new Door((int)get_pos().x+32, 512, "sector1", "main2"));
   }
+  std::cout << "KILL_FALL - HITPOINTS: " << hitpoints << ", BULLLET HP: " << bullet_hitpoints << std::endl;
 }
 
 IMPLEMENT_FACTORY(Nolok_01, "nolok_01")