[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.380,2.381

[Travis Howell]

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

Modified Files:
	gfx.cpp 
Log Message:

Revert small part of recent WizImage changes, caused regressions.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.380
retrieving revision 2.381
diff -u -d -r2.380 -r2.381
--- gfx.cpp	22 Nov 2004 20:34:28 -0000	2.380
+++ gfx.cpp	23 Nov 2004 03:08:40 -0000	2.381
@@ -1478,6 +1478,7 @@
 	if (calcClipRects(dstw, dsth, srcx, srcy, srcw, srch, rect, r1, r2)) {
 		for (int i = 0; i < 256; i++)
 			_wizImagePalette[i] = i;
+		dst += r2.left + r2.top * dstw;
 		decompressWizImage(dst, dstw, r2, src, r1);
 	}
 }
@@ -1527,7 +1528,7 @@
 	uint16 off;
 	int color;
 	
-	dstPtr = dst + dstRect.left + dstRect.top * dstPitch;
+	dstPtr = dst;
 	dataPtr = src;
 	
 	// Skip over the first 'srcRect->top' lines in the data