[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.239,1.240

kirben kirben at users.sourceforge.net
Fri Oct 21 05:25:15 CEST 2005


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

Modified Files:
	akos.cpp 
Log Message:

Enable XMAP support in akos codec 32.


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- akos.cpp	21 Oct 2005 05:15:10 -0000	1.239
+++ akos.cpp	21 Oct 2005 12:23:45 -0000	1.240
@@ -490,8 +490,8 @@
 			if (decflag == 0)
 				continue;
 
-			if ((shadowMask & 0x8000) && _shadow_table) {
-				_shadow_mode = (shadowMask) ? 3: 0;
+			if (_vm->_heversion >= 95) {
+				_shadow_mode = ((shadowMask & 0x8000) && _shadow_table) ? 3 : 0;
 			}
 
 			switch (codec) {
@@ -1279,7 +1279,11 @@
 	}
 
 	byte *dstPtr = (byte *)_out.pixels + dst.left + dst.top * _out.pitch;
-	Wiz::decompressWizImage(dstPtr, _out.pitch, dst, _srcptr, src, palPtr);
+	if (_shadow_mode == 3) {
+		Wiz::decompressWizImage(dstPtr, _out.pitch, dst, _srcptr, src, palPtr, _shadow_table);
+	} else {
+		Wiz::decompressWizImage(dstPtr, _out.pitch, dst, _srcptr, src, palPtr);
+	}
 #endif
 	return 0;
 }





More information about the Scummvm-git-logs mailing list