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

SVN-Revision: 1354

diff --git a/TODO b/TODO
index c9fe07e..4fd7cb6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -34,8 +34,6 @@ L: low priority
      ? Should disable Tux's movement temporarily (1 second?)
 [H] Tux should fall while walking in tiles that have a space between.
      - Possible solution: reduce Tux's width
-[H] When you jump into the roof or a bonus and fall back down you collide with
-    the badguys twice. Noticable with iceblocks. (level 15)
 
 [M] Save score on per-level basis to make high-score
 [M] Save time on per-level basis to make low-time-score

diff --git a/src/player.cpp b/src/player.cpp
index 2dad290..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