From: Ingo Ruhnke Date: Sun, 2 May 2004 22:17:08 +0000 (+0000) Subject: - fixed intro jumping X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2b06322e6ccef41c18ea08f2681d8d4b9ca47f4b;p=supertux.git - fixed intro jumping SVN-Revision: 926 --- diff --git a/src/title.cpp b/src/title.cpp index c282581f3..a2046d26b 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -212,7 +212,7 @@ void draw_demo(GameSession* session, double frame_ratio) random_timer.start(rand() % 3000 + 3000); walking = !walking; } - + // Wrap around at the end of the level back to the beginnig if(plevel->width * 32 - 320 < tux->base.x) { @@ -220,15 +220,17 @@ void draw_demo(GameSession* session, double frame_ratio) scroll_x = tux->base.x - 320; } + tux->can_jump = true; 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 + // 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 + { + walking = false; + } tux->draw(); } @@ -294,6 +296,13 @@ void title(void) if (Menu::current() == main_menu) logo->draw( 160, 30); + white_small_text->draw(" SuperTux " VERSION "\n" + "Copyright (c) 2003 SuperTux Devel Team\n" + "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" + "are welcome to redistribute it under certain conditions; see the file COPYING\n" + "for details.\n", + 0, 420, 0); + /* Don't draw menu, if quit is true */ Menu* menu = Menu::current(); if(menu)