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

m-kiewitz m_kiewitz at users.sourceforge.net
Mon Jun 1 13:41:09 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:
bb838da33b SHERLOCK: intro: play constable anim slower
a602421981 SHERLOCK: remove debug #ifs


Commit: bb838da33b43cd831dafbb16744ddaf4301dfb91
    https://github.com/scummvm/scummvm/commit/bb838da33b43cd831dafbb16744ddaf4301dfb91
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-01T13:40:00+02:00

Commit Message:
SHERLOCK: intro: play constable anim slower

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 275380e..20e53e9 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -224,12 +224,14 @@ void ScalpelEngine::showOpening() {
 	if (isDemo() && _interactiveFl)
 		return;
 
+#if 0
 	if (!TsAGE::Logo::show(this))
 		return;
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())
 		return;
+#endif
 	if (!showStreetCutscene())
 		return;
 	if (!showOfficeCutscene())
@@ -401,8 +403,10 @@ bool ScalpelEngine::showStreetCutscene() {
 
 	finished = _animation->play("14KICK", 1, 3, true, 2);
 
+	// Constable animation plays slower than speed 2
+	// If we play it with speed 2, music gets obviously out of sync
 	if (finished)
-		finished = _animation->play("14NOTE", 1, 0, false, 2);
+		finished = _animation->play("14NOTE", 1, 0, false, 3);
 
 	// Fade to black
 	if (finished)


Commit: a60242198198cea6f011a32d54c25daca9c21fba
    https://github.com/scummvm/scummvm/commit/a60242198198cea6f011a32d54c25daca9c21fba
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-01T13:40:44+02:00

Commit Message:
SHERLOCK: remove debug #ifs

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 20e53e9..3483828 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -224,14 +224,12 @@ void ScalpelEngine::showOpening() {
 	if (isDemo() && _interactiveFl)
 		return;
 
-#if 0
 	if (!TsAGE::Logo::show(this))
 		return;
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())
 		return;
-#endif
 	if (!showStreetCutscene())
 		return;
 	if (!showOfficeCutscene())






More information about the Scummvm-git-logs mailing list