X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.cpp;h=c1da901e298b599420f01349a2a8609c6c30005c;hb=2b18d7e2549f4be99533fed58c0f07887a19db37;hp=6e57c7b696749b55e58d27004aa7c42ccdc21297;hpb=1d613f782e21f55f915b6e5fa808e7435896461a;p=supertux.git

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 6e57c7b69..c1da901e2 100644
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -1,15 +1,38 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+
 #include <config.h>
 
 #include <float.h>
 #include "yeti.h"
 #include "object/camera.h"
 #include "yeti_stalactite.h"
+#include "bouncing_snowball.h"
 
 static const float JUMP_VEL1 = 250;
 static const float JUMP_VEL2 = 700;
 static const float RUN_SPEED = 350;
 static const float JUMP_TIME = 1.6;
 static const float ANGRY_JUMP_WAIT = .5;
+static const int INITIAL_HITPOINTS = 3;
+static const int INITIAL_BULLET_HP = 10;
 
 Yeti::Yeti(const lisp::Lisp& reader)
 {
@@ -19,8 +42,10 @@ Yeti::Yeti(const lisp::Lisp& reader)
   sprite = sprite_manager->create("yeti");
   state = INIT;
   side = LEFT;
-  sound_gna = SoundManager::get()->load_sound(
-      get_resource_filename("sounds/yeti_gna.wav"));
+  hitpoints = INITIAL_HITPOINTS;
+  bullet_hitpoints = INITIAL_BULLET_HP;
+  sound_manager->preload_sound("yeti_gna");
+  sound_manager->preload_sound("yeti_roar");  
 }
 
 Yeti::~Yeti()
@@ -47,7 +72,7 @@ Yeti::active_action(float elapsed_time)
     case ANGRY_JUMPING:
       if(timer.check()) {
         // jump
-        SoundManager::get()->play_sound(sound_gna);
+        sound_manager->play_sound("yeti_gna");
         physic.set_velocity_y(JUMP_VEL1);
       }
       break;
@@ -86,11 +111,47 @@ Yeti::angry_jumping()
   physic.set_velocity_x(0);
 }
 
+void
+Yeti::summon_snowball()
+{
+  Sector::current()->add_object(new BouncingSnowball(get_pos().x+(side == LEFT ? 64 : -64), get_pos().y, (side == LEFT ? RIGHT : LEFT)));
+}
+
+HitResponse
+Yeti::collision_player(Player& player, const CollisionHit& hit)
+{
+  if(player.is_invincible()) {
+    kill_fall();
+    return ABORT_MOVE;
+  }
+  if(hit.normal.y > .9) {
+    hitpoints--;
+    bullet_hitpoints--;
+    sound_manager->play_sound("yeti_roar");    
+    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;
+}
+
 bool
 Yeti::collision_squished(Player& player)
 {
-  kill_squished(player);
-  return true;
+  bool result = false;
+  player.bounce(*this);
+  if (hitpoints <= 0) {
+    bullet_hitpoints = 0;
+    //sprite->set_action("dead"); 
+    kill_squished(player);
+    result = true;
+  }
+  return result;
 }
 
 void
@@ -131,9 +192,11 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
       go_right();
     } else if(state == GO_LEFT && !timer.started()) {
       side = LEFT;
+      summon_snowball();
       angry_jumping();
     } else if(state == GO_RIGHT && !timer.started()) {
       side = RIGHT;
+      summon_snowball();
       angry_jumping();
     } else if(state == ANGRY_JUMPING) {
       if(!timer.started()) {
@@ -160,4 +223,18 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
   return CONTINUE;
 }
 
+void
+Yeti::kill_fall()
+{
+  sound_manager->play_sound("yeti_roar");  
+  bullet_hitpoints--;
+  if (bullet_hitpoints <= 0) {
+    sound_manager->play_sound("fall", this,
+                              Sector::current()->player->get_pos());
+    physic.set_velocity_y(0);
+    physic.enable_gravity(true);
+    set_state(STATE_FALLING);
+  }
+}
+
 IMPLEMENT_FACTORY(Yeti, "yeti")