[Scummvm-cvs-logs] SF.net SVN: scummvm:[33948] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 33948
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33948&view=rev
Author:   lordhoto
Date:     2008-08-16 21:51:56 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/screen.h

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2008-08-16 21:34:27 UTC (rev 33947)
+++ scummvm/trunk/engines/kyra/screen.cpp	2008-08-16 21:51:56 UTC (rev 33948)
@@ -554,19 +554,16 @@
 
 	copyOverlayRegion(x1, y1, x2, y2, w, h, srcPage, dstPage);
 
-	if (flags & CR_X_FLIPPED) {
+	if (flags & CR_NO_P_CHECK) {
 		while (h--) {
-			for (int i = 0; i < w; ++i) {
-				if (src[i] || (flags & CR_NO_P_CHECK))
-					dst[w-i] = src[i];
-			}
+			memcpy(dst, src, w);
 			src += SCREEN_W;
 			dst += SCREEN_W;
 		}
 	} else {
 		while (h--) {
 			for (int i = 0; i < w; ++i) {
-				if (src[i] || (flags & CR_NO_P_CHECK))
+				if (src[i])
 					dst[i] = src[i];
 			}
 			src += SCREEN_W;

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2008-08-16 21:34:27 UTC (rev 33947)
+++ scummvm/trunk/engines/kyra/screen.h	2008-08-16 21:51:56 UTC (rev 33948)
@@ -74,8 +74,7 @@
 	};
 
 	enum CopyRegionFlags {
-		CR_X_FLIPPED  = 0x01,
-		CR_NO_P_CHECK = 0x02
+		CR_NO_P_CHECK = 0x01
 	};
 
 	enum DrawShapeFlags {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.