X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fwillowisp.cpp;h=eafe2874c301aa23db3a9ba19f31508007aa7ba1;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=cc50d6bcd796a8b3a0f1932e8e216947dce09e45;hpb=c87aa7be71247c14fd9653286b9bc79a75420fca;p=supertux.git

diff --git a/src/badguy/willowisp.cpp b/src/badguy/willowisp.cpp
index cc50d6bcd..eafe2874c 100644
--- a/src/badguy/willowisp.cpp
+++ b/src/badguy/willowisp.cpp
@@ -59,6 +59,9 @@ WillOWisp::WillOWisp(const lisp::Lisp& reader)
 
   countMe = false;
   sound_manager->preload(SOUNDFILE);
+  sound_manager->preload("sounds/warp.wav");
+
+  sprite->set_action("idle");
 }
 
 void
@@ -135,8 +138,6 @@ WillOWisp::active_update(float elapsed_time)
 void
 WillOWisp::activate()
 {
-  sprite->set_action("idle");
-
   sound_source.reset(sound_manager->create_sound_source(SOUNDFILE));
   sound_source->set_position(get_pos());
   sound_source->set_looping(true);
@@ -171,7 +172,7 @@ WillOWisp::vanish()
 {
   mystate = STATE_VANISHING;
   sprite->set_action("vanishing", 1);
-  set_group(COLGROUP_DISABLED);
+  set_colgroup_active(COLGROUP_DISABLED);
 }
 
 bool
@@ -250,7 +251,7 @@ WillOWisp::set_state(const std::string& new_state)
   } else {
     std::ostringstream msg;
     msg << "Can't set unknown willowisp state '" << new_state << "', should "
-		"be stopped, move_path, move_path_track or normal";
+                "be stopped, move_path, move_path_track or normal";
     throw new std::runtime_error(msg.str());
   }
 }