[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.55,2.56

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

DstResNum state is always zero.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -d -r2.55 -r2.56
--- wiz_he.cpp	16 Apr 2005 04:56:06 -0000	2.55
+++ wiz_he.cpp	16 Apr 2005 05:18:59 -0000	2.56
@@ -960,7 +960,7 @@
 			return NULL;
 		}
 
-		uint32 cw, ch;
+		int32 cw, ch;
 		if (flags & kWIFBlitToMemBuffer) {
 			dst = (uint8 *)malloc(width * height);
 			int color = 255; // FIXME: should be (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5;
@@ -971,12 +971,10 @@
 			if (dstResNum) {
 				uint8 *dstPtr = getResourceAddress(rtImage, dstResNum);
 				assert(dstPtr);
-				wizh = findWrappedBlock(MKID('WIZH'), dstPtr, 0, 0);
-				assert(wizh);
-				cw  = READ_LE_UINT32(wizh + 0x4);
-				ch = READ_LE_UINT32(wizh + 0x8);
-				dst = findWrappedBlock(MKID('WIZD'), dstPtr, state, 0);
+				dst = findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
 				assert(dst);
+
+				getWizImageDim(dstResNum, 0, cw, ch);
 			} else {
 				VirtScreen *pvs = &virtscr[kMainVirtScreen];
 				if (flags & kWIFMarkBufferDirty) {
@@ -1200,7 +1198,7 @@
 		if (dstResNum) {
 			uint8 *dstPtr = getResourceAddress(rtImage, dstResNum);
 			assert(dstPtr);
-			dst = findWrappedBlock(MKID('WIZD'), dstPtr, state, 0);
+			dst = findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0);
 			assert(dst);
 
 			getWizImageDim(dstResNum, 0, wizW, wizH);