updated squirrel version

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

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index daa9cf6..60fac3e 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -21,6 +21,7 @@
 
 #include <float.h>
 #include <sstream>
+#include <memory>
 #include "yeti.h"
 #include "object/camera.h"
 #include "yeti_stalactite.h"
@@ -46,8 +47,10 @@ Yeti::Yeti(const lisp::Lisp& reader)
   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;
@@ -86,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;
@@ -138,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");
@@ -146,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);