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

[m_kiewitz at users.sourceforge.net]

Revision: 47577
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47577&view=rev
Author:   m_kiewitz
Date:     2010-01-26 22:34:17 +0000 (Tue, 26 Jan 2010)

Log Message:
-----------
SCI: force palette merging for kq6 hires portraits (cause its needed on those)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/graphics/palette.h
    scummvm/trunk/engines/sci/graphics/portrait.cpp

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-26 22:04:33 UTC (rev 47576)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-26 22:34:17 UTC (rev 47577)
@@ -197,21 +197,21 @@
 	return false;
 }
 
-void SciPalette::set(Palette *sciPal, uint16 flag) {
+void SciPalette::set(Palette *sciPal, uint16 flag, bool forceRealMerge) {
 	uint32 systime = _sysPalette.timestamp;
 	if (flag == 2 || sciPal->timestamp != systime) {
-		merge(sciPal, &_sysPalette, flag);
+		merge(sciPal, &_sysPalette, flag, forceRealMerge);
 		sciPal->timestamp = _sysPalette.timestamp;
 		if (_screen->_picNotValid == 0 && systime != _sysPalette.timestamp)
 			setOnScreen();
 	}
 }
 
-void SciPalette::merge(Palette *pFrom, Palette *pTo, uint16 flag) {
+void SciPalette::merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge) {
 	uint16 res;
 	int i,j;
 
-	if (getSciVersion() >= SCI_VERSION_1_1) {
+	if ((!forceRealMerge) && (getSciVersion() >= SCI_VERSION_1_1)) {
 		// SCI1.1+ doesnt do real merging anymore, but simply copying over the used colors from other palettes
 		for (i = 1; i < 255; i++) {
 			if (pFrom->colors[i].used) {

Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h	2010-01-26 22:04:33 UTC (rev 47576)
+++ scummvm/trunk/engines/sci/graphics/palette.h	2010-01-26 22:34:17 UTC (rev 47577)
@@ -41,8 +41,8 @@
 	void modifyAmigaPalette(byte *data);
 	void setEGA();
 	bool setFromResource(GuiResourceId resourceId, uint16 flag);
-	void set(Palette *sciPal, uint16 flag);
-	void merge(Palette *pFrom, Palette *pTo, uint16 flag);
+	void set(Palette *sciPal, uint16 flag, bool forceRealMerge = false);
+	void merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge);
 	uint16 matchColor(Palette *pPal, byte r, byte g, byte b);
 	void getSys(Palette *pal);
 

Modified: scummvm/trunk/engines/sci/graphics/portrait.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-01-26 22:04:33 UTC (rev 47576)
+++ scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-01-26 22:34:17 UTC (rev 47577)
@@ -140,7 +140,7 @@
 	uint syncOffset = 0;
 
 	// Set the portrait palette
-	_palette->set(&_portraitPalette, 1);
+	_palette->set(&_portraitPalette, 1, true);
 
 	// Draw base bitmap
 	drawBitmap(0);


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