Prevent "Return to Level Editor" from working, if no levelsubset is loaded. This...

[supertux.git] / src / special.cpp

diff --git a/src/special.cpp b/src/special.cpp
index b1136c7..4ce1025 100644 (file)
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -330,26 +330,13 @@ Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
       if (kind == UPGRADE_GROWUP)
         {
           play_sound(sounds[SND_EXCELLENT], SOUND_CENTER_SPEAKER);
-          pplayer->size = BIG;
-          pplayer->base.height = 64;
-         pplayer->base.y -= 32;
-         if(collision_object_map(pplayer->base))
-            {
-              pplayer->base.height = 32;
-              pplayer->base.y += 32;
-              pplayer->duck = true;
-            }
+          pplayer->grow();
         }
       else if (kind == UPGRADE_ICEFLOWER)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
+          pplayer->grow();
           pplayer->got_coffee = true;
-          if (pplayer->size == SMALL)
-            {
-              pplayer->size = BIG;
-              pplayer->base.height = 64;
-              pplayer->base.y -= 32;
-            }
         }
       else if (kind == UPGRADE_HERRING)
         {