ice yeti animation updates

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

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index c38c3ac..7ca7c6b 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -21,12 +21,13 @@
 
 #include <float.h>
 #include <sstream>
-#include "yeti.h"
-#include "object/camera.h"
-#include "yeti_stalactite.h"
-#include "bouncing_snowball.h"
-#include "game_session.h"
-#include "scripting/script_interpreter.h"
+#include <memory>
+#include "yeti.hpp"
+#include "object/camera.hpp"
+#include "yeti_stalactite.hpp"
+#include "bouncing_snowball.hpp"
+#include "game_session.hpp"
+#include "scripting/script_interpreter.hpp"
 
 static const float JUMP_VEL1 = 250;
 static const float JUMP_VEL2 = 700;
@@ -42,14 +43,17 @@ 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;
+#if 0
   sound_manager->preload_sound("yeti_gna");
   sound_manager->preload_sound("yeti_roar");
+#endif
   hit_points = INITIAL_HITPOINTS;
   reader.get("dead-script", dead_script);
+  countMe = false;
 }
 
 Yeti::~Yeti()
@@ -60,7 +64,7 @@ void
 Yeti::draw(DrawingContext& context)
 {
   // we blink when we are safe
-  if(safe_timer.started() && size_t(global_time*40)%2)
+  if(safe_timer.started() && size_t(game_time*40)%2)
     return;
 
   BadGuy::draw(context);
@@ -85,7 +89,7 @@ Yeti::active_update(float elapsed_time)
     case ANGRY_JUMPING:
       if(timer.check()) {
         // jump
-        sound_manager->play_sound("yeti_gna");
+        sound_manager->play("sounds/yeti_gna.wav");
         physic.set_velocity_y(JUMP_VEL1);
       }
       break;
@@ -137,7 +141,7 @@ Yeti::collision_squished(Player& player)
     return true;
 
   player.bounce(*this);
-  sound_manager->play_sound("yeti_roar");
+  sound_manager->play("sounds/yeti_roar.wav");
   hit_points--;
   if(hit_points <= 0) {
     sprite->set_action("dead");
@@ -145,17 +149,8 @@ Yeti::collision_squished(Player& player)
 
     // start script
     if(dead_script != "") {
-      try {
-        ScriptInterpreter* interpreter 
-          = new ScriptInterpreter(GameSession::current()->get_working_directory());
-        interpreter->register_sector(Sector::current());
-        std::istringstream in(dead_script);
-        interpreter->load_script(in, "Yeti - dead-script");
-        interpreter->start_script();
-        Sector::current()->add_object(interpreter);
-      } catch(std::exception& e) {
-        std::cerr << "Couldn't execute yeti dead script: " << e.what() << "\n";
-      }
+      ScriptInterpreter::add_script_object(Sector::current(),
+          "Yeti - dead-script", dead_script);
     }
   } else {
     safe_timer.start(SAFE_TIME);
@@ -171,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
@@ -219,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);