[Scummvm-cvs-logs] CVS: scummvm/scumm script_v80he.cpp,2.119,2.120

kirben kirben at users.sourceforge.net
Thu Jun 9 18:47:30 CEST 2005


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

Modified Files:
	script_v80he.cpp 
Log Message:

Adjust for HE100


Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.119
retrieving revision 2.120
diff -u -d -r2.119 -r2.120
--- script_v80he.cpp	28 May 2005 08:37:44 -0000	2.119
+++ script_v80he.cpp	10 Jun 2005 01:43:46 -0000	2.120
@@ -716,18 +716,20 @@
 
 	markRectAsDirty(vs->number, x, y, x, y + 1);
 
-	if (flags & 0x4000) {
+	if ((flags & 0x4000) || (flags & 0x2000000)) {
 		src = vs->getPixels(x, y);
 		dst = vs->getBackPixels(x, y);
 		*dst = *src;
-	} else if (flags & 0x2000) {
+	} else if ((flags & 0x2000) || (flags & 4000000)) {
 		src = vs->getBackPixels(x, y);
 		dst = vs->getPixels(x, y);
 		*dst = *src;
+	} else if (flags & 0x8000000) {
+		error("drawPixel: unsupported flag 0x%x", flags);
 	} else {
 		dst = vs->getPixels(x, y);
 		*dst = flags;
-		if (flags & 0x8000) {
+		if ((flags & 0x8000) || (flags & 0x1000000)) {
 			dst = vs->getBackPixels(x, y);
 			*dst = flags;
 		}





More information about the Scummvm-git-logs mailing list