[Scummvm-cvs-logs] scummvm master -> 3b076459914d8f9cbc1db2e6def6c5ce952e3ffe

[eriktorbjorn]

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:
3b07645991 SHERLOCK: Don't skip rest of intro when skipping DOS EA logo


Commit: 3b076459914d8f9cbc1db2e6def6c5ce952e3ffe
    https://github.com/scummvm/scummvm/commit/3b076459914d8f9cbc1db2e6def6c5ce952e3ffe
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-08T21:45:24+02:00

Commit Message:
SHERLOCK: Don't skip rest of intro when skipping DOS EA logo

This is how the original works, as far as I can tell.

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index dab2919..89232a7 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -252,8 +252,7 @@ void ScalpelEngine::showOpening() {
 		return;
 	}
 
-	if (!TsAGE::Logo::show(this))
-		return;
+	TsAGE::Logo::show(this);
 	if (!showCityCutscene())
 		return;
 	if (!showAlleyCutscene())