[Scummvm-cvs-logs] scummvm master -> 7d00e33c092fd3c4f6a5c8eb8e78a4e6419cb60e

[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:
7d00e33c09 SHERLOCK: 3DO: add 3DO EA Splash screen


Commit: 7d00e33c092fd3c4f6a5c8eb8e78a4e6419cb60e
    https://github.com/scummvm/scummvm/commit/7d00e33c092fd3c4f6a5c8eb8e78a4e6419cb60e
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-08T21:41:29+02:00

Commit Message:
SHERLOCK: 3DO: add 3DO EA Splash screen

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



diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 024ad51..dab2919 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -240,9 +240,7 @@ void ScalpelEngine::showOpening() {
 		return;
 
 	if (getPlatform() == Common::kPlatform3DO) {
-		// 3DO intro
-		Scalpel3DOMoviePlay("EAlogo.stream", Common::Point(20, 0));
-		_screen->clear();
+		show3DOSplash();
 		if (!showCityCutscene3DO())
 			return;
 		if (!showAlleyCutscene3DO())
@@ -528,6 +526,27 @@ bool ScalpelEngine::showOfficeCutscene() {
 }
 
 // 3DO variant
+bool ScalpelEngine::show3DOSplash() {
+	// 3DO EA Splash screen
+	ImageFile3DO titleImage_3DOSplash("3DOSplash.cel");
+
+	_screen->transBlitFromUnscaled3DO(titleImage_3DOSplash[0]._frame, Common::Point(0, -20));
+	bool finished = _events->delay(3000, true);
+
+	if (finished) {
+		_screen->clear();
+		finished = _events->delay(500, true);
+	}
+
+	if (finished) {
+		// EA logo movie
+		Scalpel3DOMoviePlay("EAlogo.stream", Common::Point(20, 0));
+		_screen->clear();
+	}
+
+	return finished;
+}
+
 bool ScalpelEngine::showCityCutscene3DO() {
 	_animation->_soundLibraryFilename = "TITLE.SND";
 
diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h
index e84f3aa..8a10094 100644
--- a/engines/sherlock/scalpel/scalpel.h
+++ b/engines/sherlock/scalpel/scalpel.h
@@ -35,6 +35,8 @@ private:
 	Darts *_darts;
 	int _mapResult;
 
+	bool show3DOSplash();
+
 	/**
 	 * Show the starting city cutscene which shows the game title
 	 */