SCI: update sys palette timestamp only on kDrawPic in SCI1.1, fixes intro of island of dr. brain

svn-id: r50077

1 files changed, 9 insertions, 1 deletions

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 7fa76586ad..447ad23ebe 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -292,10 +292,18 @@ bool GfxPalette::merge(Palette *pFrom, bool force, bool forceRealMerge) {
 			}
 		}
 	}
-	_sysPalette.timestamp = g_system->getMillis() * 60 / 1000;
+
+	// We don't update the timestamp here for SCI1.1, it's only updated on kDrawPic calls
+	if (getSciVersion() < SCI_VERSION_1_1)
+		_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++;
+}
+
 uint16 GfxPalette::matchColor(byte r, byte g, byte b) {
 	byte found = 0xFF;
 	int diff = 0x2FFFF, cdiff;