[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.458,2.459

[kirben]

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

Modified Files:
	gfx.cpp 
Log Message:

Add HE100 difference in flags and tmp code for extra flags.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.458
retrieving revision 2.459
diff -u -d -r2.458 -r2.459
--- gfx.cpp	23 May 2005 03:33:08 -0000	2.458
+++ gfx.cpp	26 May 2005 14:59:36 -0000	2.459
@@ -1060,11 +1060,14 @@
 			fill(mask, _charset->_textSurface.pitch, CHARSET_MASK_TRANSPARENCY, width, height);
 		}
 	} else {
-		// Flags are used for different methods in HE70+ games
-		if ((color & 0x2000) || (color & 0x4000)) {
-			error("drawBox: unsupported flag 0x%x", color);
-		} else if (color & 0x8000) {
-			color &= 0x7FFF;
+		// Flags are used for different methods in HE71+ games
+		// TODO: Add correct drawing method
+		if ((color & 0x2000) || (color & 0x4000000)) {
+			blit(backbuff, vs->pitch, bgbuff, vs->pitch, width, height);
+		} else if ((color & 0x4000) || (color & 0x2000000)) {
+			blit(bgbuff, vs->pitch, backbuff, vs->pitch, width, height);
+		} else if ((color & 0x8000) || (color & 0x1000000)) {
+			color &= (_heversion == 100) ? 0xFFFFFF : 0x7FFF;
 			fill(backbuff, vs->pitch, color, width, height);
 			fill(bgbuff, vs->pitch, color, width, height);
 		} else {