X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=afc4eb5e078232cd59033ee104e21c43118c7809;hb=54769dff40025a2e798d2544df6d745196968f94;hp=afc0c6517dbc8a950edaadbf5783e6102767f6fc;hpb=41037fd38811c825b347aa25daea22d240502a65;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index afc0c6517..afc4eb5e0 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -456,6 +456,8 @@ Player::handle_input()
       duck = false;
       base.y -= 32;
       base.height = 64;
+      // changing base size confuses collision otherwise
+      old_base = previous_base = base;                        
     }
 }
 
@@ -468,13 +470,6 @@ Player::grow()
   size = BIG;
   base.height = 64;
   base.y -= 32;
-  // eventually go in duck mode if there's no space
-  if(collision_object_map(base))
-    {
-      base.height = 32;
-      base.y += 32;
-      duck = true;
-    }
 
   old_base = previous_base = base;
 }