From: Christoph Sommer <mail@christoph-sommer.de>
Date: Sun, 3 Feb 2008 17:26:07 +0000 (+0000)
Subject: Tux grows faster, stops growing when hit
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;p=supertux.git

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 d07e4632d..6700c42a0 100644
--- 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 fdbe8f2b8..08b50da28 100644
--- 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);