- fixed some enums

[supertux.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index 5701c18..da3774c 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -310,15 +310,35 @@ World::action(double frame_ratio)
   }
 }
 
-// the space that it takes for the screen to start scrolling, regarding
-// screen bounds (in pixels)
+/* the space that it takes for the screen to start scrolling, regarding
+/* screen bounds (in pixels) */
+// should be higher than screen->w/2 (320)
 #define X_SPACE (400-16)
+// should be less than screen->h/2 (240)
+#define Y_SPACE 200
+
 // the time it takes to move the camera (in ms)
 #define CHANGE_DIR_SCROLL_SPEED 2000
 
 /* 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)
@@ -375,18 +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);
-
-  scroll_y = tux_pos_y - (screen->h / 2);
-
-  // 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