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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Tue Oct 6 00:42:41 CEST 2009


Revision: 44681
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44681&view=rev
Author:   m_kiewitz
Date:     2009-10-05 22:42:41 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
SCI/newgui: Implemented trick to get dithering going after drawing picture w/o destroying statusbar

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

Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-05 21:47:28 UTC (rev 44680)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp	2009-10-05 22:42:41 UTC (rev 44681)
@@ -321,8 +321,11 @@
 		//warning("%X at %d", data[curPos], curPos);
 		switch (pic_op = data[curPos++]) {
 		case PIC_OP_SET_COLOR:
-			byte = data[curPos++];
-			pic_color = isEGA ? EGApalette[byte] : byte;
+			pic_color = data[curPos++];
+			if (isEGA) {
+				pic_color = EGApalette[pic_color];
+				pic_color ^= pic_color << 4;
+			}
 			break;
 		case PIC_OP_DISABLE_VISUAL:
 			pic_color = 0xFF;

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 21:47:28 UTC (rev 44680)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-05 22:42:41 UTC (rev 44681)
@@ -204,8 +204,12 @@
 	for (y = 0; y < _height; y++) {
 		for (x = 0; x < _width; x++) {
 			color = *screenPtr;
-			color = ((x^y) & 1) ? color >> 4 : color & 0x0F;
-			*screenPtr++ = color; *displayPtr++ = color;
+			if (color & 0xF0) {
+				color ^= color << 4;
+				color = ((x^y) & 1) ? color >> 4 : color & 0x0F;
+				*screenPtr = color; *displayPtr = color;
+			}
+			screenPtr++; displayPtr++;
 		}
 	}
 }


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