From: Ricardo Cruz Date: Tue, 4 May 2004 19:12:39 +0000 (+0000) Subject: Removed scrolling printf, back scrolling from level 13 and snow from menu. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a20422ead26eb777bfc5a8a0978cf330e9044746;p=supertux.git Removed scrolling printf, back scrolling from level 13 and snow from menu. So, two points are gone now. Notice that the back scrolling is still in development, so please calm down, and don't add it to the TODO as a bug. Besides no level use it. I told Ryan to give a look at that code now. SVN-Revision: 979 --- diff --git a/TODO b/TODO index 5891b796b..d8bcef6f0 100644 --- a/TODO +++ b/TODO @@ -11,10 +11,6 @@ Todo H: high priority L: low priority -[H] Scrolling still broken, changing directions while jumping causes - the camera to 'jump', level13 even more broken and full of debug prints -[M] Tux releases bonus in the intro without collecting them, looks - stupid, background is most likly drawn twice, intro shouldn't have snow [M] When aborting a level, lives and score should remain the same as they were before. Solution: make more dependency between the game engine and worldmap or just backup those variables before starting a level. diff --git a/data/levels/misc/menu.stl b/data/levels/misc/menu.stl index 8b79d153c..008b38956 100644 --- a/data/levels/misc/menu.stl +++ b/data/levels/misc/menu.stl @@ -11,7 +11,6 @@ (bkgd_blue 255) (time 500) (gravity 10) - (particle_system "snow") (theme "antarctica") (interactive-tm 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/data/levels/world1/level13.stl b/data/levels/world1/level13.stl index 9eca13312..e3ef2d5e0 100644 --- a/data/levels/world1/level13.stl +++ b/data/levels/world1/level13.stl @@ -17,7 +17,7 @@ (bkgd_blue_bottom 255) (time 200) (gravity 10.0) - (back_scrolling #t) + (back_scrolling #f) (particle_system "clouds") (theme "antarctica") (interactive-tm diff --git a/src/world.cpp b/src/world.cpp index 54051f65a..68bc9259a 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -330,7 +330,7 @@ void World::scrolling(double frame_ratio) final_scroll_x = tux_pos_x - (screen->w - X_SPACE); else// if (tux.dir == LEFT)// && ) final_scroll_x = tux_pos_x - X_SPACE; -printf("%f\n", frame_ratio); + scroll_x += ((final_scroll_x - scroll_x) / (CHANGE_DIR_SCROLL_SPEED)) * frame_ratio; }