[Pingus-CVS] r2885 - in branches/pingus_sdl: . src/components

[plouj at BerliOS]

Author: plouj
Date: 2007-08-13 18:25:36 +0200 (Mon, 13 Aug 2007)
New Revision: 2885

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/components/playfield.cpp
Log:
only border scroll with screengrab or fullscreen


Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-13 15:55:01 UTC (rev 2884)
+++ branches/pingus_sdl/TODO    2007-08-13 16:25:36 UTC (rev 2885)
@@ -45,8 +45,6 @@
 Important:
 ==========
 
-- only auto/border-scroll with screengrab or fullscreen
-
 - in old levels the exits float high up in the air (conversion likely wrong)
 
 - update INSTALL.* file

Modified: branches/pingus_sdl/src/components/playfield.cpp
===================================================================
--- branches/pingus_sdl/src/components/playfield.cpp    2007-08-13 15:55:01 UTC 
(rev 2884)
+++ branches/pingus_sdl/src/components/playfield.cpp    2007-08-13 16:25:36 UTC 
(rev 2885)
@@ -143,7 +143,7 @@
         }
     }
 
-  if (auto_scrolling)
+  if (auto_scrolling && (fullscreen_enabled || 
SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON))
     {
       // FIXME: May need to modify this function if it's not gradient enough.
       scroll_speed = static_cast<int>(800 * delta);