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

kirben kirben at users.sourceforge.net
Fri Apr 15 23:17:41 CEST 2005


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

Modified Files:
	wiz_he.cpp 
Log Message:

Add missing check for palette remap in drawWizImage.
Can get further in freddi4.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -d -r2.56 -r2.57
--- wiz_he.cpp	16 Apr 2005 05:18:59 -0000	2.56
+++ wiz_he.cpp	16 Apr 2005 06:16:22 -0000	2.57
@@ -950,10 +950,12 @@
 		if (flags & kWIFRemapPalette) {
 			rmap = findWrappedBlock(MKID('RMAP'), dataPtr, state, 0);
 			assert(rmap);
-			uint8 *rgbs = findWrappedBlock(MKID('RGBS'), dataPtr, state, 0);
-			assert(rgbs);
-			remapPalette(rgbs, rmap + 4);
-			warning("drawWizImage() flag 0x2");
+			if (_heversion <= 80 || READ_BE_UINT32(rmap) != 0x01234567) {
+				uint8 *rgbs = findWrappedBlock(MKID('RGBS'), dataPtr, state, 0);
+				assert(rgbs);
+				remapPalette(rgbs, rmap + 4);
+				debug(0, "drawWizImage() flag 0x2");
+			}
 		}
 		if (flags & kWIFPrint) {
 			warning("WizImage printing is unimplemented");
@@ -1380,7 +1382,7 @@
 		assert(iwiz);
 		uint8 *rmap = findWrappedBlock(MKID('RMAP'), iwiz, st, 0) ;
 		assert(rmap);
-		WRITE_BE_UINT32(rmap, 0x12345678);
+		WRITE_BE_UINT32(rmap, 0x01234567);
 		while (num--) {
 			uint8 idx = *index++;
 			rmap[4 + idx] = params->remapColor[idx];
@@ -1698,7 +1700,7 @@
 			assert(iwiz);
 			uint8 *rmap = findWrappedBlock(MKID('RMAP'), iwiz, state, 0) ;
 			assert(rmap);
-			WRITE_BE_UINT32(rmap, 0x12345678);
+			WRITE_BE_UINT32(rmap, 0x01234567);
 			while (num--) {
 				uint8 idx = *index++;
 				rmap[4 + idx] = params->remapColor[idx];





More information about the Scummvm-git-logs mailing list