Skip to content

Commit

Permalink
SHERLOCK: Add delay between 3DO EA logo animation and fade in
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Torbjörn Andersson committed Jun 16, 2015
1 parent 8b4bdbd commit 3e5e63f
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions engines/sherlock/scalpel/scalpel.cpp
Expand Up @@ -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
Expand Down

0 comments on commit 3e5e63f

Please sign in to comment.