[Super-tux-commit] supertux/src world.cpp,1.79,1.80

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13720/src

Modified Files:
	world.cpp 
Log Message:
Smoother vertical scrolling.
You can play a bit with Y_SPACE, in case you want to tune it more.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- world.cpp	12 May 2004 01:29:29 -0000	1.79
+++ world.cpp	12 May 2004 12:18:47 -0000	1.80
@@ -310,9 +310,13 @@
   }
 }
 
-// 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
 
@@ -380,7 +384,10 @@
 
   float tux_pos_y = tux.base.y + (tux.base.height/2);
 
-  scroll_y = tux_pos_y - (screen->h / 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)