- fixed 'When you jump into the roof or a bonus and fall back down you collide with...

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 27d909e..e041dd5 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -239,6 +239,7 @@ Player::action(float elapsed_time)
               // fall down
               physic.set_velocity_y(0);
               jumped_in_solid = true;
+              jumping = false;
             }
         }
       else
@@ -312,7 +313,10 @@ Player::on_ground()
 {
   return ( issolid(base.x + base.width / 2, base.y + base.height) ||
            issolid(base.x + 1, base.y + base.height) ||
-           issolid(base.x + base.width - 1, base.y + base.height)  );
+           issolid(base.x + base.width - 1, base.y + base.height) ||
+          isunisolid(base.x + base.width / 2, base.y + base.height) ||
+          isunisolid(base.x + 1, base.y + base.height) ||
+          isunisolid(base.x + base.width - 1, base.y + base.height) );
 }
 
 bool