diff options
author | Torbjörn Andersson | 2015-06-17 00:37:26 +0200 |
---|---|---|
committer | Torbjörn Andersson | 2015-06-17 00:40:35 +0200 |
commit | 3e5e63fa4a209f4813fe41546dbb020f8be5b910 (patch) | |
tree | 37108f93dc61ca8c634adfcb2979bb96092fe1c2 | |
parent | 8b4bdbd2f434dea80c277e5d535e88464ee930bc (diff) | |
download | scummvm-rg350-3e5e63fa4a209f4813fe41546dbb020f8be5b910.tar.gz scummvm-rg350-3e5e63fa4a209f4813fe41546dbb020f8be5b910.tar.bz2 scummvm-rg350-3e5e63fa4a209f4813fe41546dbb020f8be5b910.zip |
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.
-rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index 4e94631b4a..faead3be07 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 |