From ca95721a114be67e05953c0c801e524314072200 Mon Sep 17 00:00:00 2001 From: Ryan Flegel Date: Wed, 5 May 2004 22:24:37 +0000 Subject: [PATCH] - fixed scrolling problem when starting from a reset point SVN-Revision: 1001 --- src/world.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/world.cpp b/src/world.cpp index 4564c01c4..9a2b5e2e0 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -361,13 +361,21 @@ void World::scrolling(double frame_ratio) } else /*no debug*/ - { + { if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE)) scroll_x = tux_pos_x - (screen->w - X_SPACE); else if (tux.physic.get_velocity_x() < 0 && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling) scroll_x = tux_pos_x - X_SPACE; + else + { + if (tux.dir == RIGHT && scroll_x < tux_pos_x - (screen->w - X_SPACE)) + scroll_x = tux_pos_x - (screen->w - X_SPACE); + else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && level->back_scrolling) + scroll_x = tux_pos_x - X_SPACE; } + } + // this code prevent the screen to scroll before the start or after the level's end if(scroll_x < 0) scroll_x = 0; -- 2.11.0