From: Ricardo Cruz <rick2@aeiou.pt>
Date: Wed, 12 May 2004 12:40:46 +0000 (+0000)
Subject: Just changed the vertical scrolling to the top of the scrolling func or else it would... 
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0e5cec5d867ae2031190da2294fa43f202ade389;p=supertux.git

Just changed the vertical scrolling to the top of the scrolling func or else it wouldn't work when autoscrolling is enabled..

SVN-Revision: 1129
---

diff --git a/src/world.cpp b/src/world.cpp
index 0f8532886..da3774c78 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -323,6 +323,22 @@ World::action(double frame_ratio)
 /* This functions takes cares of the scrolling */
 void World::scrolling(double frame_ratio)
 {
+  /* Y-axis scrolling */
+
+  float tux_pos_y = tux.base.y + (tux.base.height/2);
+
+  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
+    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
+  else if (scroll_y > tux_pos_y - Y_SPACE)
+    scroll_y = tux_pos_y - Y_SPACE;
+
+  // this code prevent the screen to scroll before the start or after the level's end
+  if(scroll_y < 0)
+    scroll_y = 0;
+  if(scroll_y > level->height * 32 - screen->h)
+    scroll_y = level->height * 32 - screen->h;
+
+  /* X-axis scrolling */
 
   /* Auto scrolling */
   if(level->hor_autoscroll_speed)
@@ -379,21 +395,6 @@ void World::scrolling(double frame_ratio)
     scroll_x = 0;
   if(scroll_x > level->width * 32 - screen->w)
     scroll_x = level->width * 32 - screen->w;
-
-  /* Y-axis scrolling */
-
-  float tux_pos_y = tux.base.y + (tux.base.height/2);
-
-  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
-    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
-  else if (scroll_y > tux_pos_y - Y_SPACE)
-    scroll_y = tux_pos_y - Y_SPACE;
-
-  // this code prevent the screen to scroll before the start or after the level's end
-  if(scroll_y < 0)
-    scroll_y = 0;
-  if(scroll_y > level->height * 32 - screen->h)
-    scroll_y = level->height * 32 - screen->h;
 }
 
 void