[Scummvm-cvs-logs] scummvm master -> 15bbe3bff18178b0b66fb73a33782813f9e96999

wjp wjp at usecode.org
Sun Feb 12 13:33:09 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
15bbe3bff1 SCI: Expand adjustGraphColor to work for older EGA games too


Commit: 15bbe3bff18178b0b66fb73a33782813f9e96999
    https://github.com/scummvm/scummvm/commit/15bbe3bff18178b0b66fb73a33782813f9e96999
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-02-12T04:32:22-08:00

Commit Message:
SCI: Expand adjustGraphColor to work for older EGA games too

See bug #3486899.

Changed paths:
    engines/sci/engine/kgraphics.cpp



diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index cfeaaaa..caae562 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -59,11 +59,13 @@
 namespace Sci {
 
 static int16 adjustGraphColor(int16 color) {
-	// WORKAROUND: SCI1 EGA and Amiga 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 (getSciVersion() >= SCI_VERSION_1_EARLY && g_sci->getResMan()->getViewType() == kViewEga)
+	// WORKAROUND: EGA and Amiga games can set invalid colors (above 0 - 15).
+	// It seems only the lower nibble was used in these games.
+	// bug #3048908, #3486899.
+	// Confirmed in EGA games KQ4(late), QFG1(ega), LB1 that
+	// at least FillBox (only one of the functions using adjustGraphColor)
+	// behaves like this.
+	if (g_sci->getResMan()->getViewType() == kViewEga)
 		return color & 0x0F;	// 0 - 15
 	else
 		return color;






More information about the Scummvm-git-logs mailing list