From f80fa6d908cbe59f55f2bf6c9c9fb8a96037da29 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Sun, 2 May 2004 15:30:50 +0000 Subject: [PATCH] fixed (well worked around) jump problems in the intro SVN-Revision: 918 --- TODO | 4 ++-- src/title.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index cd00ba022..cc9cdd46c 100644 --- 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 478fc35d6..ec5618aeb 100644 --- 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(); } -- 2.11.0