X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fjumpy.cpp;h=20b3f51364b59f7f96a811b76c02e24a6aeb4109;hb=8b8e1c3576cedddb1d88eafa5fd4804e8257793c;hp=706a7d7bb2ac1ca486e9ebe5213c6a8b277446d4;hpb=3655d32f63f75b2af054ec68d4176e55a561ba96;p=supertux.git

diff --git a/src/badguy/jumpy.cpp b/src/badguy/jumpy.cpp
index 706a7d7bb..20b3f5136 100644
--- a/src/badguy/jumpy.cpp
+++ b/src/badguy/jumpy.cpp
@@ -26,8 +26,10 @@ static const float JUMPY_MID_TOLERANCE=4;
 static const float JUMPY_LOW_TOLERANCE=2;
 
 Jumpy::Jumpy(const lisp::Lisp& reader)
-    : BadGuy(reader, "images/creatures/jumpy/jumpy.sprite"), groundhit_pos_set(false)
+    : BadGuy(reader, "images/creatures/snowjumpy/snowjumpy.sprite"), groundhit_pos_set(false)
 {
+  // TODO create a nice sound for this...
+  //sound_manager->preload("sounds/skid.wav");
 }
 
 void
@@ -63,7 +65,7 @@ Jumpy::hit(const CollisionHit& chit)
       groundhit_pos_set = true;
     }
 
-    physic.set_velocity_y(frozen ? 0 : JUMPSPEED);
+    physic.set_velocity_y((frozen || get_state() == STATE_FALLING) ? 0 : JUMPSPEED);
     // TODO create a nice sound for this...
     //sound_manager->play("sounds/skid.wav");
   } else if(chit.top) {