[Scummvm-cvs-logs] SF.net SVN: scummvm:[45374] scummvm/trunk/engines/sci/gui/gui_view.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sun Oct 25 20:49:09 CET 2009


Revision: 45374
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45374&view=rev
Author:   m_kiewitz
Date:     2009-10-25 19:49:09 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiView disable undithering when EGA mappings are available (support needs to get implemented for this case), also fixes a part of the undithering code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_view.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-25 19:04:36 UTC (rev 45373)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-25 19:49:09 UTC (rev 45374)
@@ -373,6 +373,10 @@
 	// Makes no sense to process bitmaps that are 3 pixels wide or less
 	if (width <= 3) return;
 
+	// TODO: Implement ability to undither bitmaps when EGAmappings are set (qfg2)
+	if (_EGAmapping)
+		return;
+
 	// Walk through the bitmap and remember all combinations of colors
 	int16 bitmapMemorial[SCI_SCREEN_UNDITHERMEMORIAL_SIZE];
 	byte *curPtr;
@@ -384,7 +388,7 @@
 	// Count all seemingly dithered pixel-combinations as soon as at least 4 pixels are adjacent
 	curPtr = bitmapPtr;
 	for (y = 0; y < height; y++) {
-		color1 = (curPtr[0] << 8) | (curPtr[1] << 4); color2 = curPtr[2];
+		color1 = curPtr[0]; color2 = (curPtr[1] << 4) | curPtr[2];
 		curPtr += 3;
 		for (x = 3; x < width; x++) {
 			color1 = (color1 << 4) | (color2 >> 4);


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