[Scummvm-git-logs] scummvm master -> 561a0efda3ef6a81ab24c3f59940f8d4d9195ee1

[somaen]

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:
561a0efda3 TINSEL: Add detection for Discworld Noir


Commit: 561a0efda3ef6a81ab24c3f59940f8d4d9195ee1
    https://github.com/scummvm/scummvm/commit/561a0efda3ef6a81ab24c3f59940f8d4d9195ee1
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2020-10-30T23:37:49+01:00

Commit Message:
TINSEL: Add detection for Discworld Noir

Some of this is adapted from kimskoglund's
tinsel noir repository at Sourceforge:
https://sourceforge.net/projects/tinselnoir/

Changed paths:
    engines/tinsel/detection.cpp
    engines/tinsel/detection.h
    engines/tinsel/detection_tables.h


diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index f002fc9864..b5a1e41913 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -31,6 +31,7 @@
 static const PlainGameDescriptor tinselGames[] = {
 	{"dw", "Discworld"},
 	{"dw2", "Discworld 2: Missing Presumed ...!?"},
+	{"noir", "Discworld Noir"},
 	{0, 0}
 };
 
diff --git a/engines/tinsel/detection.h b/engines/tinsel/detection.h
index 61c3a53bc4..905aac4a7e 100644
--- a/engines/tinsel/detection.h
+++ b/engines/tinsel/detection.h
@@ -29,7 +29,8 @@ namespace Tinsel {
 
 enum TinselGameID {
 	GID_DW1 = 0,
-	GID_DW2 = 1
+	GID_DW2 = 1,
+	GID_NOIR = 2
 };
 
 enum TinselGameFeatures {
@@ -59,7 +60,8 @@ enum TinselGameFeatures {
 enum TinselEngineVersion {
 	TINSEL_V0 = 0,
 	TINSEL_V1 = 1,
-	TINSEL_V2 = 2
+	TINSEL_V2 = 2,
+	TINSEL_V3 = 3
 };
 
 struct TinselGameDescription {
diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index a4fe36eb14..3948fb6ee8 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -807,6 +807,28 @@ static const TinselGameDescription gameDescriptions[] = {
 		TINSEL_V2,
 	},
 
+	// ==== Discworld Noir entries ===============================================
+	// Note: All Discworld Noir versions are CD only, therefore we don't add the ADGF_CD flag
+
+	{ // Discworld Noir, Windows 3CD version
+		{
+			"noir",
+			"CD",
+			{
+				{"dw3.scn", 0, "16104acdc66cda903f860acac02a96bd", -1},
+				{"english.smp", 0, "94e510fd33c5c4a67b274bf5c068a87a", -1},
+				{NULL, 0, NULL, 0}
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE
+		},
+		GID_NOIR,
+		0,
+		GF_SCNFILES,
+		TINSEL_V3,
+	},
+
 	{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
 };