[Scummvm-cvs-logs] scummvm master -> 2528a892bfe18feabf7bd13f2eb60c147d33d0ca

[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:
2528a892bf SHERLOCK: add detection for SH1 German+Spanish


Commit: 2528a892bfe18feabf7bd13f2eb60c147d33d0ca
    https://github.com/scummvm/scummvm/commit/2528a892bfe18feabf7bd13f2eb60c147d33d0ca
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-13T22:57:56+02:00

Commit Message:
SHERLOCK: add detection for SH1 German+Spanish

Changed paths:
    engines/sherlock/detection_tables.h
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index f6a5dc7..991fc20 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -40,6 +40,42 @@ static const SherlockGameDescription gameDescriptions[] = {
 	},
 
 	{
+		// Case of the Serrated Scalpel - German CD (from multilingual CD)
+		// Provided by m_kiewitz
+		{
+			"scalpel",
+			0, {
+				{"talk.lib", 0, "40a5f9f37c0e0d2ad48d8f44d8e393c9", 284278},
+				{"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
+				AD_LISTEND},
+			Common::DE_DEU,
+			Common::kPlatformDOS,
+			ADGF_UNSTABLE,
+			GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,
+				GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE)
+		},
+		GType_SerratedScalpel,
+	},
+
+	{
+		// Case of the Serrated Scalpel - Spanish CD (from multilingual CD)
+		// Provided by m_kiewitz
+		{
+			"scalpel",
+			0, {
+				{"talk.lib", 0, "27697804b637a7f3b77234bf16f15dce", 171419},
+				{"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
+				AD_LISTEND},
+			Common::ES_ESP,
+			Common::kPlatformDOS,
+			ADGF_UNSTABLE,
+			GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,
+				GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE)
+		},
+		GType_SerratedScalpel,
+	},
+
+	{
 		// Case of the Serrated Scalpel - English 3DO
 		{
 			"scalpel",
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index efb2b90..c4b87cf 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1127,7 +1127,7 @@ void Scene::transitionToScene() {
 		} else {
 			// fade in for 3DO
 			screen.clear();
-			screen.fadeIntoScreen3DO(2);
+			screen.fadeIntoScreen3DO(3);
 		}
 	} else {
 		screen.blitFrom(screen._backBuffer1);