[Scummvm-cvs-logs] scummvm master -> ca858f6a9a9665a0bd8e302a32ab9f4105c72df7

[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:
ca858f6a9a SHERLOCK: intro changes


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

Commit Message:
SHERLOCK: intro changes

- shortened delay during "in the alley" text,
  so that music track change occurs correctly
- added fade to black during alley cutscene

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 113c4ee..ca3befb 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -507,7 +507,7 @@ bool ScalpelEngine::showCityCutscene() {
 			// In the alley...
 			_screen->transBlitFrom(titleImages[3], Common::Point(72, 51));
 			_screen->fadeIn(palette, 3);
-			finished = _events->delay(3000, true);
+			finished = _events->delay(2500, true);
 		}
 	}
 
@@ -524,8 +524,16 @@ bool ScalpelEngine::showAlleyCutscene() {
 	_animation->_soundLibraryFilename = "TITLE.SND";
 
 	bool finished = _animation->play("27PRO1", 1, 3, true, 2);
-	if (finished)
+	if (finished) {
+		_screen->getPalette(palette);
+		_screen->fadeToBlack(2);
+		finished = _events->delay(500);
+	}
+
+	if (finished) {
+		_screen->setPalette(palette);
 		finished = _animation->play("27PRO2", 1, 0, false, 2);
+	}
 
 	if (finished) {
 		showLBV("scream.lbv");