fade out console

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

diff --git a/src/badguy/snowsnail.cpp b/src/badguy/snowsnail.cpp
index fdb10af..c644dc4 100644 (file)
--- a/src/badguy/snowsnail.cpp
+++ b/src/badguy/snowsnail.cpp
@@ -33,7 +33,7 @@ SnowSnail::SnowSnail(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowsnail");
+  sprite = sprite_manager->create("images/creatures/snowsnail/snowsnail.sprite");
   set_direction = false;
 }
 
@@ -43,7 +43,7 @@ SnowSnail::SnowSnail(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowsnail");
+  sprite = sprite_manager->create("images/creatures/snowsnail/snowsnail.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -70,7 +70,7 @@ SnowSnail::activate()
 void
 SnowSnail::active_update(float elapsed_time)
 {
-  if(flat_timer.started()) {
+  if((ice_state != ICESTATE_KICKED) && flat_timer.started()) {
     sprite->set_fps(64 - 15 * flat_timer.get_timegone());
   }
   if(ice_state == ICESTATE_FLAT && flat_timer.check()) {
@@ -107,6 +107,7 @@ SnowSnail::collision_solid(GameObject& object, const CollisionHit& hit)
       
       dir = dir == LEFT ? RIGHT : LEFT;
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+      sprite->set_fps(64);
       physic.set_velocity_x(-physic.get_velocity_x());
       sound_manager->play("sounds/iceblock_bump.wav", get_pos());
       break;
@@ -175,6 +176,7 @@ SnowSnail::collision_squished(Player& player)
       }
       physic.set_velocity_x(dir == LEFT ? -KICKSPEED : KICKSPEED);
       sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
+      sprite->set_fps(64);
       ice_state = ICESTATE_KICKED;
       break;
   }