[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.297,2.298

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14815/scumm

Modified Files:
	gfx.cpp 
Log Message:
code simplification

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.297
retrieving revision 2.298
diff -u -d -r2.297 -r2.298
--- gfx.cpp	4 Sep 2004 01:31:04 -0000	2.297
+++ gfx.cpp	5 Sep 2004 10:10:29 -0000	2.298
@@ -1407,14 +1407,14 @@
 		return;
 		
 	while (1) {
+		if (h < 0)
+			break;
+		--h;
 		xoff = srcRect->left;
 		off = READ_LE_UINT16(dataPtr);
 		w = srcRect->right - srcRect->left + 1;
 		dstPtrNext = dstWidth + dstPtr;
 		dataPtrNext = off + 2 + dataPtr;
-		if (h < 0)
-			break;
-		--h;
 		dataPtr += 2;	
 		if (off == 0) goto dec_next;
 
@@ -1466,27 +1466,20 @@
 				if (databit) {
 					++code;
 dec_sub2:			w -= code;
-					if (w >= 0) {
-						memset(dstPtr, *dataPtr++, code);
-						dstPtr += code;
-					} else {
+					if (w < 0) {
 						code += w;
-						memset(dstPtr, *dataPtr++, code);
-						dstPtr += code;
 					}
+					memset(dstPtr, *dataPtr++, code);
+					dstPtr += code;
 				} else {
 					++code;
 dec_sub3:			w -= code;
-					if (w >= 0) {
-						memcpy(dstPtr, dataPtr, code);
-						dstPtr += code;
-						dataPtr += code;
-					} else {
+					if (w < 0) {
 						code += w;
-						memcpy(dstPtr, dataPtr, code);
-						dstPtr += code;
-						dataPtr += code;
 					}
+					memcpy(dstPtr, dataPtr, code);
+					dstPtr += code;
+					dataPtr += code;
 				}
 			}
 		}