[Super-tux-commit] supertux/src player.cpp,1.86,1.87

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

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

Modified Files:
	player.cpp 
Log Message:
Small clean-up.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- player.cpp	8 May 2004 10:41:42 -0000	1.86
+++ player.cpp	8 May 2004 14:57:07 -0000	1.87
@@ -756,13 +756,15 @@
   if(base.x < scroll_x && (!back_scrolling || hor_autoscroll))  // can happen if back scrolling is disabled
     base.x = scroll_x;
 
-  if(base.x == scroll_x && hor_autoscroll)
-    if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
-      kill(KILL);
-
-  if(base.x + base.width > scroll_x + screen->w && hor_autoscroll)
-    base.x = scroll_x + screen->w - base.width;
+  if(hor_autoscroll)
+    {
+    if(base.x == scroll_x)
+      if(issolid(base.x+32, base.y) || (size != SMALL && issolid(base.x+32, base.y+32)))
+        kill(KILL);
 
+    if(base.x + base.width > scroll_x + screen->w)
+      base.x = scroll_x + screen->w - base.width;
+    }
     
 }