[Scummvm-cvs-logs] scummvm master -> 1968528a1f8c8f8cce730e74478832b17e375c1a

[m-kiewitz]

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:
1968528a1f SHERLOCK: start of street intro quitable now


Commit: 1968528a1f8c8f8cce730e74478832b17e375c1a
    https://github.com/scummvm/scummvm/commit/1968528a1f8c8f8cce730e74478832b17e375c1a
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-02T18:33:50+02:00

Commit Message:
SHERLOCK: start of street intro quitable now

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 3483828..9736dff 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -399,7 +399,8 @@ bool ScalpelEngine::showStreetCutscene() {
 		finished = _music->waitUntilTick(0xE4, 0xFFFF, 0, 1000);
 	}
 
-	finished = _animation->play("14KICK", 1, 3, true, 2);
+	if (finished)
+		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