Tux grows faster, stops growing when hit

SVN-Revision: 5309

diff --git a/data/images/creatures/tux/tux.sprite b/data/images/creatures/tux/tux.sprite
index d07e463..6700c42 100644 (file)
--- a/data/images/creatures/tux/tux.sprite
+++ b/data/images/creatures/tux/tux.sprite
@@ -88,7 +88,7 @@
 
        (action
          (name "grow-right")
-         (fps 5.0)
+         (fps 15.0)
          (hitbox 16 13 32 64)
          (images "small/grow-0.png"
                  "small/grow-1.png"

diff --git a/src/object/player.cpp b/src/object/player.cpp
index fdbe8f2..08b50da 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -1098,6 +1098,8 @@ Player::kill(bool completely)
   if(!completely && (safe_timer.started() || invincible_timer.started()))
     return;
 
+  growing = false;
+
   sound_manager->play("sounds/hurt.wav");
 
   if (climbing) stop_climbing(*climbing);