fade out console

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

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 10a33e0..f34a550 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -27,7 +27,6 @@
 #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;
@@ -155,8 +154,8 @@ Yeti::collision_squished(Player& player)
 
     // start script
     if(dead_script != "") {
-      ScriptInterpreter::add_script_object(Sector::current(),
-          "Yeti - dead-script", dead_script);
+      std::istringstream stream(dead_script);
+      Sector::current()->run_script(stream, "Yeti - dead-script");
     }
   } else {
     safe_timer.start(SAFE_TIME);
@@ -192,13 +191,16 @@ Yeti::drop_stalactite()
   YetiStalactite* nearest = 0;
   float dist = FLT_MAX;
 
+  Player* player = this->get_nearest_player();
+  if (!player) return;
+
   Sector* sector = Sector::current();
   for(Sector::GameObjects::iterator i = sector->gameobjects.begin();
       i != sector->gameobjects.end(); ++i) {
     YetiStalactite* stalactite = dynamic_cast<YetiStalactite*> (*i);
     if(stalactite && stalactite->is_hanging()) {
       float sdist 
-        = fabsf(stalactite->get_pos().x - sector->player->get_pos().x);
+        = fabsf(stalactite->get_pos().x - player->get_pos().x);
       if(sdist < dist) {
         nearest = stalactite;
         dist = sdist;