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

[thebluegr at users.sourceforge.net]

Revision: 54142
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54142&view=rev
Author:   thebluegr
Date:     2010-11-08 16:09:59 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
SCI/SCI2: Some slight changes to the graphics code

- Changed the SCI1 EGA games workaround in kGraphDrawLine() to match the ones in kGraphFillBoxAny() and kNewWindow, updating the relevant comments
- Added some comments in kSetShowStyle()

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-11-08 12:24:18 UTC (rev 54141)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-11-08 16:09:59 UTC (rev 54142)
@@ -256,10 +256,11 @@
 	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
-	// FIXME: EGA? Which EGA? SCI0 or SCI1? Check the
-	// workarounds inside kGraphFillBoxAny and kNewWindow
-	if (!g_sci->getResMan()->isVGA() && !g_sci->getResMan()->isAmiga32color())
+	// WORKAROUND: SCI1 EGA games can set 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->kernelGraphDrawLine(getGraphPoint(argv), getGraphPoint(argv + 2), color, priority, control);
@@ -297,7 +298,7 @@
 	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).
+	// WORKAROUND: SCI1 EGA games can set 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.
@@ -1088,7 +1089,7 @@
 	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).
+	// WORKAROUND: SCI1 EGA games can set 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.
@@ -1453,6 +1454,7 @@
 	// TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
 	kStub(s, argc, argv);
 
+	// Can be called with 7, 8 or 9 parameters
 	// showStyle matches the style selector of the associated plane object
 	uint16 showStyle = argv[0].toUint16();	// 0 - 15
 	reg_t planeObj = argv[1];
@@ -1469,6 +1471,8 @@
 		return s->r_acc;
 	}
 
+	// TODO: Check if the plane is in the list of planes to draw
+
 	return s->r_acc;
 }
 


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