[Scummvm-cvs-logs] scummvm master -> 3e5e63fa4a209f4813fe41546dbb020f8be5b910

eriktorbjorn eriktorbjorn at telia.com
Wed Jun 17 00:41:43 CEST 2015


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

Summary:
8b4bdbd2f4 SHERLOCK: Increase delay before 3DO credits, when there is no music
3e5e63fa4a SHERLOCK: Add delay between 3DO EA logo animation and fade in


Commit: 8b4bdbd2f434dea80c277e5d535e88464ee930bc
    https://github.com/scummvm/scummvm/commit/8b4bdbd2f434dea80c277e5d535e88464ee930bc
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-17T00:40:35+02:00

Commit Message:
SHERLOCK: Increase delay before 3DO credits, when there is no music

This better matches a YouTube video I've seen of the intro, though
the case where there is no music is unlikely to happen outside of
debugging.

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index c46f2f0..4e94631 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -833,7 +833,7 @@ bool ScalpelEngine::showOfficeCutscene3DO() {
 		finished = _animation->play3DO("COFF4", true, 1, false, 3);
 
 	if (finished) {
-		finished = _music->waitUntilMSec(244500, 0, 0, 500);
+		finished = _music->waitUntilMSec(244500, 0, 0, 2000);
 
 		// TODO: Brighten the image, possibly by doing a partial fade
 		// to white.


Commit: 3e5e63fa4a209f4813fe41546dbb020f8be5b910
    https://github.com/scummvm/scummvm/commit/3e5e63fa4a209f4813fe41546dbb020f8be5b910
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-17T00:40:35+02:00

Commit Message:
SHERLOCK: Add delay between 3DO EA logo animation and fade in

In the YouTube video I've seen, the screen goes black, the rain
sound starts, and then the screen fades up. Once we add the rain
sound, this should be pretty close to that. I think it adds to the
atmosphere.

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 4e94631..faead3b 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -605,17 +605,26 @@ bool ScalpelEngine::show3DOSplash() {
 bool ScalpelEngine::showCityCutscene3DO() {
 	_animation->_soundLibraryFilename = "TITLE.SND";
 
-	// Play intro music
-	_music->playMusic("prolog");
-
-	// Fade screen to grey
-	_screen->_backBuffer1.fill(0xCE59); // RGB565: 25, 50, 25 (grey)
-	_screen->fadeIntoScreen3DO(2);
+	_screen->clear();
+	bool finished = _events->delay(2500, true);
 
 	// rain.aiff seems to be playing in an endless loop until
 	// sherlock logo fades away TODO
 
-	bool finished = _music->waitUntilMSec(3400, 0, 0, 3400);
+	if (finished) {
+		finished = _events->delay(2500, true);
+
+		// Play intro music
+		_music->playMusic("prolog");
+
+		// Fade screen to grey
+		_screen->_backBuffer1.fill(0xCE59); // RGB565: 25, 50, 25 (grey)
+		_screen->fadeIntoScreen3DO(2);
+	}
+
+	if (finished) {
+		finished = _music->waitUntilMSec(3400, 0, 0, 3400);
+	}
 
 	if (finished) {
 		_screen->_backBuffer1.fill(0); // fill backbuffer with black to avoid issues during fade from white






More information about the Scummvm-git-logs mailing list