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

[m_kiewitz at users.sourceforge.net]

Revision: 50078
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50078&view=rev
Author:   m_kiewitz
Date:     2010-06-20 13:30:40 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
SCI: update timestamp like before for inbetween SCI1.1 games

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

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 13:25:08 UTC (rev 50077)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 13:30:40 UTC (rev 50078)
@@ -244,6 +244,9 @@
 				pFrom->mapping[i] = i;
 			}
 		}
+		// We don't update the timestamp for SCI1.1, it's only updated on kDrawPic calls
+		return paletteChanged;
+
 	} else {
 		// colors 0 (black) and 255 (white) are not affected by merging
 		for (i = 1 ; i < 255; i++) {
@@ -293,15 +296,15 @@
 		}
 	}
 
-	// We don't update the timestamp here for SCI1.1, it's only updated on kDrawPic calls
-	if (getSciVersion() < SCI_VERSION_1_1)
+	if (!forceRealMerge)
 		_sysPalette.timestamp = g_system->getMillis() * 60 / 1000;
 	return paletteChanged;
 }
 
 // This is used for SCI1.1 and called from kDrawPic. We only update sysPalette timestamp this way for SCI1.1
 void GfxPalette::increaseSysTimestamp() {
-	_sysPalette.timestamp++;
+	if (!_alwaysForceRealMerge) // Don't do this on inbetween SCI1.1 games
+		_sysPalette.timestamp++;
 }
 
 uint16 GfxPalette::matchColor(byte r, byte g, byte b) {


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