[Scummvm-cvs-logs] scummvm master -> 0fcddd58ee9395bc992777152b6f4af41bed1624

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0fcddd58ee SHERLOCK: implement 2 palette faes for the intro


Commit: 0fcddd58ee9395bc992777152b6f4af41bed1624
    https://github.com/scummvm/scummvm/commit/0fcddd58ee9395bc992777152b6f4af41bed1624
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-01T00:12:00+02:00

Commit Message:
SHERLOCK: implement 2 palette faes for the intro

Changed paths:
    engines/sherlock/scalpel/scalpel.cpp



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 43b6906..113c4ee 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -440,8 +440,13 @@ void ScalpelEngine::showOpening() {
 }
 
 bool ScalpelEngine::showCityCutscene() {
+	byte greyPalette[PALETTE_SIZE];
 	byte palette[PALETTE_SIZE];
 
+	// Demo fades from black into grey and then fades from grey into the scene
+	Common::fill(&greyPalette[0], &greyPalette[PALETTE_SIZE], 142);
+	_screen->fadeIn((const byte *)greyPalette, 3);
+
 	_music->playMusic("prolog1.mus");
 	_animation->_gfxLibraryFilename = "title.lib";
 	_animation->_soundLibraryFilename = "title.snd";
@@ -569,7 +574,10 @@ bool ScalpelEngine::scrollCredits() {
 	// Load the images for displaying credit text
 	Common::SeekableReadStream *stream = _res->load("credits.vgs", "title.lib");
 	ImageFile creditsImages(*stream);
-	_screen->setPalette(creditsImages._palette);
+
+	// Demo fades slowly from the scene into credits palette
+	_screen->fadeIn(creditsImages._palette, 3);
+
 	delete stream;
 
 	// Save a copy of the screen background for use in drawing each credit frame