fixed (well worked around) jump problems in the intro

SVN-Revision: 918

diff --git a/TODO b/TODO
index cd00ba0..cc9cdd4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -12,8 +12,6 @@ Todo
 - tux sometimes makes short jumps in the endsequence, mostly when
   going through the goal with a small jump, might be old_up related
 - fadein/out for intro/extro would be nice
-- when you interrupted the intro (by going to credits for example) and go back
-  to it, tux doesn't jump anymore
 - when jupming against the 2nd multiple coin block in a level only 1 coin will
   come out.
 - when jumping into the exit with a star, the endgame music will change back to
@@ -32,6 +30,8 @@ Todo
 Fixed
 -----
 
+- when you interrupted the intro (by going to credits for example) and go back
+  to it, tux doesn't jump anymore
 - supertux crashs from time to time - fixed
 - mriceblock doesn't fall down when being squished in the air - fixed
 - It's not possible to duck while jumping - fixed

diff --git a/src/title.cpp b/src/title.cpp
index 478fc35..ec5618a 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -222,10 +222,12 @@ void draw_demo(GameSession* session, double frame_ratio)
   float last_tux_x_pos = tux->base.x;
   tux->action(frame_ratio);
 
+#if 0 // disabled for now, since with the new jump code we easily get deadlocks
   // Jump if tux stays in the same position for one loop, ie. if he is
   // stuck behind a wall
   if (last_tux_x_pos == tux->base.x)
     walking = false;
+#endif
 
   tux->draw();
 }