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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu Nov 4 19:37:04 CET 2010


Revision: 54068
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54068&view=rev
Author:   m_kiewitz
Date:     2010-11-04 18:37:03 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
SCI: adding force to memorial area for SQ3/intro

makes the view getting fully undithered

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/picture.cpp
    scummvm/trunk/engines/sci/graphics/screen.cpp
    scummvm/trunk/engines/sci/graphics/screen.h

Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp	2010-11-04 16:09:20 UTC (rev 54067)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp	2010-11-04 18:37:03 UTC (rev 54068)
@@ -754,6 +754,15 @@
 			// Dithering EGA pictures
 			if (isEGA) {
 				_screen->dither(_addToFlag);
+				switch (g_sci->getGameId()) {
+				case GID_SQ3:
+					switch (_resourceId) {
+					case 154: // SQ3: intro, ship gets sucked in
+						_screen->ditherForceMemorial(0xD0);
+						break;
+					}
+					break;
+				}
 			}
 			return;
 		default:

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-11-04 16:09:20 UTC (rev 54067)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-11-04 18:37:03 UTC (rev 54068)
@@ -616,6 +616,11 @@
 	}
 }
 
+// Force a color combination into memorial
+void GfxScreen::ditherForceMemorial(byte color) {
+	_unditherMemorial[color] = 256;
+}
+
 void GfxScreen::debugUnditherSetState(bool flag) {
 	_unditherState = flag;
 }

Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h	2010-11-04 16:09:20 UTC (rev 54067)
+++ scummvm/trunk/engines/sci/graphics/screen.h	2010-11-04 18:37:03 UTC (rev 54068)
@@ -115,6 +115,7 @@
 	void adjustBackUpscaledCoordinates(int16 &y, int16 &x);
 
 	void dither(bool addToFlag);
+	void ditherForceMemorial(byte color);
 	void debugUnditherSetState(bool flag);
 	int16 *unditherGetMemorial();
 


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