badguys now have normal hitpoints and bullet hitpoints, so you can make them need...

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

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 4a20978..1c1f581 100644 (file)
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -10,6 +10,9 @@ static const float Y_OFFSCREEN_DISTANCE = 1200;
 BadGuy::BadGuy()
   : sprite(0), dir(LEFT), state(STATE_INIT)
 {
+  //Set hitpoints and bullet hitpoints
+  hitpoints = 1;
+  bullet_hitpoints = 1;
 }
 
 BadGuy::~BadGuy()
@@ -131,8 +134,17 @@ BadGuy::collision_player(Player& player, const CollisionHit& hit)
     return ABORT_MOVE;
   }
   if(hit.normal.y > .9) {
+    //TODO: fix inaccuracy (tux sometimes dies even if badguy was hit)
+    //      give badguys some invincible time (prevent them from being hit multiple times)
+    hitpoints--;
+    bullet_hitpoints--;
     if(collision_squished(player))
       return ABORT_MOVE;
+    else if (hitpoints <= 0) {
+      bullet_hitpoints = 0;
+      player.kill(Player::SHRINK);
+      return FORCE_MOVE;
+    }
   }
   player.kill(Player::SHRINK);
   return FORCE_MOVE;
@@ -165,11 +177,14 @@ BadGuy::kill_squished(Player& player)
 void
 BadGuy::kill_fall()
 {
-  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);
+  bullet_hitpoints--;
+  if (bullet_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);
+  }
 }
 
 void
@@ -190,7 +205,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;