[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.209,1.210

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5282

Modified Files:
	scummvm.cpp 
Log Message:
cleanup

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- scummvm.cpp	19 Aug 2002 17:20:56 -0000	1.209
+++ scummvm.cpp	20 Aug 2002 02:13:41 -0000	1.210
@@ -425,23 +425,18 @@
 		moveCamera();
 		fixObjectFlags();
 		CHARSET_1();
-		if (!(_features & GF_AFTER_V7)) {
-			if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw) {
-				redrawBGAreas();
-			}
-		} else {
-			if (camera._cur.x != camera._last.x || camera._cur.y != camera._last.y
-					|| _BgNeedsRedraw || _fullRedraw) {
-				redrawBGAreas();
-			}
+
+		if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw
+				|| (_features & GF_AFTER_V7 && camera._cur.y != camera._last.y)) {
+			redrawBGAreas();
 		}
+
 		processDrawQue();
 		setActorRedrawFlags();
 		resetActorBgs();
 
 		if (!(_vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_screen) &&
 		      _vars[VAR_CURRENT_LIGHTS] & LIGHTMODE_flashlight) {
-			warning("Flashlight not implemented in this version");
 			drawFlashlight();
 			setActorRedrawFlags();
 		}