[Scummvm-cvs-logs] scummvm master -> dc1706700be6e3c10d5db6938109221ec04df7d3
m-kiewitz
m_kiewitz at users.sourceforge.net
Mon Jun 8 20:19:28 CEST 2015
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:
dc1706700b SHERLOCK: 3DO: add delay right at the intro start
Commit: dc1706700be6e3c10d5db6938109221ec04df7d3
https://github.com/scummvm/scummvm/commit/dc1706700be6e3c10d5db6938109221ec04df7d3
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-08T20:18:41+02:00
Commit Message:
SHERLOCK: 3DO: add delay right at the intro start
Changed paths:
engines/sherlock/scalpel/scalpel.cpp
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index af06f45..ec0e397 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -537,7 +537,10 @@ bool ScalpelEngine::showCityCutscene3DO() {
// rain.aiff seems to be playing in an endless loop until
// sherlock logo fades away TODO
- bool finished = _animation->play3DO("26open1", true, 1, 255, 2);
+ bool finished = _music->waitUntilMSec(3400, 0, 0, 3400);
+
+ if (finished)
+ finished = _animation->play3DO("26open1", true, 1, 255, 2);
if (finished) {
// TODO: Both of these should actually fade into the screen
@@ -547,7 +550,7 @@ bool ScalpelEngine::showCityCutscene3DO() {
ImageFile3DO titleImage_London("title2a.cel");
_screen->transBlitFromUnscaled3DO(titleImage_London[0]._frame, Common::Point(30, 50));
- finished = _events->delay(1000, true);
+ finished = _events->delay(2000, true);
if (finished) {
// "November, 1888"
More information about the Scummvm-git-logs
mailing list