[Super-tux-commit] supertux/src world.cpp,1.64,1.65

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

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

Modified Files:
	world.cpp 
Log Message:
Made the back scrolling to work in debug mode (and also only).
If you want to test it, just run supertux as 'supertux --debug-mode'.

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- world.cpp	5 May 2004 23:58:06 -0000	1.64
+++ world.cpp	6 May 2004 12:47:45 -0000	1.65
@@ -320,9 +320,9 @@
 {
   int tux_pos_x = (int)(tux.base.x + (tux.base.width/2));
 
-  if (level->back_scrolling || debug_mode)
+  if (/*level->back_scrolling || */debug_mode)
   {
-    if(tux.old_dir != tux.dir && level->back_scrolling)
+    if(tux.old_dir != tux.dir)
       scrolling_timer.start(CHANGE_DIR_SCROLL_SPEED);
 
     if(scrolling_timer.check())
@@ -350,13 +350,13 @@
     {
       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)
+      else if (tux.physic.get_velocity_x() < 0 && scroll_x > tux_pos_x - X_SPACE && debug_mode)
         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)
+        else if (tux.dir == LEFT && scroll_x > tux_pos_x - X_SPACE && debug_mode)
             scroll_x = tux_pos_x - X_SPACE;
       }
     }
@@ -364,20 +364,10 @@
 
   else /*no debug*/
   {
-    if (tux.physic.get_velocity_x() > 0 && scroll_x < tux_pos_x - (screen->w - X_SPACE))
+    if (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;