X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=46588010d58f7e8db8b2248116f2e5474e643fc5;hb=f2d345c3ccec7743e39df2f59e546ad415257b81;hp=f04beb32ac832a59779bf268a3216c5f5b7f6b29;hpb=1a9a17c629934dc2a72a375c03fa2be100cf4b81;p=supertux.git

diff --git a/src/object/player.cpp b/src/object/player.cpp
index f04beb32a..46588010d 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -215,6 +215,12 @@ Player::adjust_height(float new_height)
 }
 
 void
+Player::trigger_sequence(std::string sequence_name)
+{
+  GameSession::current()->start_sequence(sequence_name);
+}
+
+void
 Player::update(float elapsed_time)
 {
   if( no_water ){
@@ -1051,17 +1057,22 @@ Player::kill(bool completely)
 
   physic.set_velocity_x(0);
 
-  if(!completely && is_big()) {
+  if(!completely && (is_big() || growing_timer.started())) {
     if(player_status->bonus == FIRE_BONUS
         || player_status->bonus == ICE_BONUS) {
       safe_timer.start(TUX_SAFE_TIME);
       set_bonus(GROWUP_BONUS, true);
-    } else {
+    } else if(player_status->bonus == GROWUP_BONUS) {
       //growing_timer.start(GROWING_TIME);
       safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */);
       adjust_height(30.8);
       duck = false;
       set_bonus(NO_BONUS, true);
+    } else if(player_status->bonus == NO_BONUS) {
+      growing_timer.stop();
+      safe_timer.start(TUX_SAFE_TIME);
+      adjust_height(30.8);
+      duck = false;
     }
   } else {
     for (int i = 0; (i < 5) && (i < player_status->coins); i++)