[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.59,2.60

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

wizImage compression type 2 uses different decode method, so disable for now.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.59
retrieving revision 2.60
diff -u -d -r2.59 -r2.60
--- wiz_he.cpp	17 Apr 2005 07:40:40 -0000	2.59
+++ wiz_he.cpp	17 Apr 2005 09:45:38 -0000	2.60
@@ -1011,7 +1011,15 @@
 			palPtr = rmap + 4;
 		}
 
-		if (comp == 1) {
+		switch (comp) {
+		case 0:
+			{
+			uint8 *trns = findWrappedBlock(MKID('TRNS'), dataPtr, state, 0);
+			int color = (trns == NULL) ? VAR(VAR_WIZ_TCOLOR) : -1;
+			_wiz.copyRawWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, flags, palPtr, color);
+			}
+			break;
+		case 1:
 			// TODO Adding masking for flags 0x80 and 0x100
 			if (flags & 0x80) {
 				warning("drawWizImage: Unhandled flag 0x80");
@@ -1020,11 +1028,11 @@
 				error("drawWizImage: Unhandled flag 0x100");
 			}
 			_wiz.copyWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, palPtr);
-		} else if (comp == 0 || comp == 2 || comp == 3) {
-			uint8 *trns = findWrappedBlock(MKID('TRNS'), dataPtr, state, 0);
-			int color = (trns == NULL) ? VAR(VAR_WIZ_TCOLOR) : -1;
-			_wiz.copyRawWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, flags, palPtr, color);
-		} else {
+			break;
+		case 2:
+			warning("drawWizImage: Unhandled wiz compression type %d", comp);
+			break;
+		default:
 			error("drawWizImage: Unhandled wiz compression type %d", comp);
 		}