[Scummvm-cvs-logs] scummvm master -> 252b4d13171093ec90289e887bab891f591fe59c

[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:
252b4d1317 SHERLOCK: always stop music after intro


Commit: 252b4d13171093ec90289e887bab891f591fe59c
    https://github.com/scummvm/scummvm/commit/252b4d13171093ec90289e887bab891f591fe59c
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-11T12:44:37+02:00

Commit Message:
SHERLOCK: always stop music after intro

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 6192a2b..b8baf40 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -236,31 +236,35 @@ void ScalpelEngine::initialize() {
 }
 
 void ScalpelEngine::showOpening() {
+	bool finished = true;
+
 	if (isDemo() && _interactiveFl)
 		return;
 
 	if (getPlatform() == Common::kPlatform3DO) {
 		show3DOSplash();
-		if (!showCityCutscene3DO())
-			return;
-		if (!showAlleyCutscene3DO())
-			return;
-		if (!showStreetCutscene3DO())
-			return;
-		if (!showOfficeCutscene3DO())
-			return;
+
+		finished = showCityCutscene3DO();
+		if (finished)
+			finished = showAlleyCutscene3DO();
+		if (finished)
+			finished = showStreetCutscene3DO();
+		if (finished)
+			finished = showOfficeCutscene3DO();
+
+		_events->clearEvents();
+		_music->stopMusic();
 		return;
 	}
 
 	TsAGE::Logo::show(this);
-	if (!showCityCutscene())
-		return;
-	if (!showAlleyCutscene())
-		return;
-	if (!showStreetCutscene())
-		return;
-	if (!showOfficeCutscene())
-		return;
+	finished = showCityCutscene();
+	if (finished)
+		finished = showAlleyCutscene();
+	if (finished)
+		finished = showStreetCutscene();
+	if (finished)
+		finished = showOfficeCutscene();
 
 	_events->clearEvents();
 	_music->stopMusic();