X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=690e97aa589384614b3a265fda82d1a58f574c79;hb=3392b0f249cbb2d1151a145ab3a86b9389a0b36e;hp=e010794bdcdf72ee215104560eed68f0bd4349d7;hpb=9e3d8f3cc7a07ab4dae67e86c6f1d0e0e450fa54;p=supertux.git diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp index e010794bd..690e97aa5 100644 --- a/src/badguy/badguy.cpp +++ b/src/badguy/badguy.cpp @@ -136,7 +136,6 @@ BadGuy::collision_player(Player& player, const CollisionHit& hit) // give badguys some invincible time (prevent them from being hit multiple times) // use hitpoints also when hit by fireball or invincible tux hitpoints--; - std::cout << "Hitpoints: " << hitpoints << std::endl; if(collision_squished(player)) return ABORT_MOVE; else if (hitpoints <= 0) { @@ -200,7 +199,7 @@ BadGuy::set_state(State state) break; case STATE_INACTIVE: // was the badguy dead anyway? - if(laststate == STATE_SQUISHED || laststate == STATE_SQUISHED) { + if(laststate == STATE_SQUISHED || laststate == STATE_FALLING) { remove_me(); } flags |= FLAG_NO_COLLDET;