Just removed a part of the applied patch. IMO it is so much better when player change...

Didn't touch the speed.

SVN-Revision: 1352

diff --git a/src/camera.cpp b/src/camera.cpp
index 41ffd98..bef202d 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -202,10 +202,10 @@ Camera::scroll_normal(float elapsed_time)
       || (player->dir == ::RIGHT && scrollchange == LEFT))
     scrollchange = NONE;
   // when in left 1/3rd of screen scroll left
-  if(player->base.x < translation.x + screen->w/3 - 32 && do_backscrolling)
+  if(player->base.x < translation.x + screen->w/3 && do_backscrolling)
     scrollchange = LEFT;
   // scroll right when in right 1/3rd of screen
-  else if(player->base.x > translation.x + screen->w/3*2 + 32)
+  else if(player->base.x > translation.x + screen->w/3*2)
     scrollchange = RIGHT;
 
   // calculate our scroll target depending on scroll mode