ice yeti animation updates

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

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 7e404a3..7ca7c6b 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -43,7 +43,7 @@ Yeti::Yeti(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(80, 120);
-  sprite = sprite_manager->create("yeti");
+  sprite = sprite_manager->create("images/creatures/yeti/yeti.sprite");
   sprite->set_action("right");
   state = INIT;
   side = LEFT;
@@ -89,7 +89,7 @@ Yeti::active_update(float elapsed_time)
     case ANGRY_JUMPING:
       if(timer.check()) {
         // jump
-        sound_manager->play("sounds/yeti_gna.ogg");
+        sound_manager->play("sounds/yeti_gna.wav");
         physic.set_velocity_y(JUMP_VEL1);
       }
       break;
@@ -141,7 +141,7 @@ Yeti::collision_squished(Player& player)
     return true;
 
   player.bounce(*this);
-  sound_manager->play("sounds/yeti_roar.ogg");
+  sound_manager->play("sounds/yeti_roar.wav");
   hit_points--;
   if(hit_points <= 0) {
     sprite->set_action("dead");
@@ -166,8 +166,18 @@ Yeti::kill_fall()
 }
 
 void
-Yeti::write(lisp::Writer& )
+Yeti::write(lisp::Writer& writer)
 {
+  writer.start_list("yeti");
+
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
+
+  if(dead_script != "") {
+    writer.write_string("dead-script", dead_script);
+  }
+
+  writer.end_list("yeti");
 }
 
 void
@@ -214,6 +224,8 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
     } else if(state == ANGRY_JUMPING) {
       if(!timer.started()) {
         // we just landed
+       // FixME need help here setting the walk,stand,jump image states
+       sprite->set_action("jump-right");
         jumpcount++;
         // make a stalactite falling down and shake camera a bit
         Sector::current()->camera->shake(.1, 0, 10);