[Scummvm-cvs-logs] SF.net SVN: scummvm:[52291] scummvm/trunk/engines/sci/engine/kgraphics.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Aug 23 01:55:29 CEST 2010


Revision: 52291
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52291&view=rev
Author:   thebluegr
Date:     2010-08-22 23:55:29 +0000 (Sun, 22 Aug 2010)

Log Message:
-----------
SCI: Fixed bug #3048908 - "PQ3EGA: Wrong speech bubble background colors" and added a FIXME inside kGraphDrawLine

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-08-22 23:21:48 UTC (rev 52290)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-08-22 23:55:29 UTC (rev 52291)
@@ -269,7 +269,9 @@
 	int16 priority = (argc > 5) ? argv[5].toSint16() : -1;
 	int16 control = (argc > 6) ? argv[6].toSint16() : -1;
 
-	// TODO: Find out why we get >15 for color in EGA
+	// TODO: Find out why we get > 15 for color in EGA
+	// FIXME: EGA? Which EGA? SCI0 or SCI1? Check the
+	// workarounds inside kGraphFillBoxAny and kNewWindow
 	if (!g_sci->getResMan()->isVGA() && !g_sci->getResMan()->isAmiga32color())
 		color &= 0x0F;
 
@@ -308,6 +310,13 @@
 	int16 priority = argv[6].toSint16(); // yes, we may read from stack sometimes here
 	int16 control = argv[7].toSint16(); // sierra did the same
 
+	// WORKAROUND: PQ3 EGA is setting invalid colors (above 0 - 15).
+	// Colors above 15 are all white in SCI1 EGA games, which is why this was never
+	// observed. We clip them all to (0, 15) instead, as colors above 15 are used
+	// for the undithering algorithm in EGA games - bug #3048908.
+	if (g_sci->getResMan()->getViewType() == kViewEga && getSciVersion() >= SCI_VERSION_1_EARLY)
+		color &= 0x0F;
+
 	g_sci->_gfxPaint16->kernelGraphFillBox(rect, colorMask, color, priority, control);
 	return s->r_acc;
 }
@@ -1081,6 +1090,15 @@
 	int colorPen = (argc > 7 + argextra) ? argv[7 + argextra].toSint16() : 0;
 	int colorBack = (argc > 8 + argextra) ? argv[8 + argextra].toSint16() : 255;
 
+	// WORKAROUND: PQ3 EGA is setting invalid colors (above 0 - 15).
+	// Colors above 15 are all white in SCI1 EGA games, which is why this was never
+	// observed. We clip them all to (0, 15) instead, as colors above 15 are used
+	// for the undithering algorithm in EGA games - bug #3048908.
+	if (g_sci->getResMan()->getViewType() == kViewEga && getSciVersion() >= SCI_VERSION_1_EARLY) {
+		colorPen &= 0x0F;
+		colorBack &= 0x0F;
+	}
+
 	//	const char *title = argv[4 + argextra].segment ? kernel_dereference_char_pointer(s, argv[4 + argextra], 0) : NULL;
 	if (argc>=13) {
 		rect2 = Common::Rect (argv[5].toSint16(), argv[4].toSint16(), argv[7].toSint16(), argv[6].toSint16());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list