[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.61,2.62

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

Fix source clipping of rawWizImages in HE games.
Can get further in spyozon now.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.61
retrieving revision 2.62
diff -u -d -r2.61 -r2.62
--- wiz_he.cpp	19 Apr 2005 17:55:08 -0000	2.61
+++ wiz_he.cpp	21 Apr 2005 12:25:53 -0000	2.62
@@ -343,12 +343,7 @@
 		}
 		int h = r1.height();
 		int w = r1.width();
-		if (srcx < 0) {
-			src -= srcx;
-		}
-		if (srcy < 0) {
-			src -= srcy * srcw;
-		}
+		src += r1.left + r1.top * srcw;
 		dst += r2.left + r2.top * dstw;
 		while (h--) {
 			const uint8 *p = src;
@@ -916,7 +911,7 @@
 }
 
 uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, int xmapNum, const Common::Rect *clipBox, int flags, int dstResNum, int paletteNum) {
-	debug(1, "drawWizImage(resNum %d, x1 %d, y1 %d, flags 0x%X, xmapNum %d paletteNum %d)", resNum, x1, y1, flags, xmapNum, paletteNum);
+	debug(1, "drawWizImage(resNum %d, x1 %d, y1 %d, flags 0x%X, xmapNum %d dstResNum %d paletteNum %d)", resNum, x1, y1, flags, xmapNum, dstResNum, paletteNum);
 	uint8 *dst = NULL;
 	const uint8 *palPtr = NULL;
 	if (_heversion >= 99) {