[Scummvm-git-logs] scummvm master -> afdc87d99f0c3a75408916c291ec43088848ad59

[somaen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e692edeea5 TINSEL: Add detection for the Discworld Noir Demo
afdc87d99f TINSEL: Error out when trying to start Discworld Noir for now.


Commit: e692edeea528de7f803f03926529aac3ecbc767a
    https://github.com/scummvm/scummvm/commit/e692edeea528de7f803f03926529aac3ecbc767a
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2020-10-31T00:09:03+01:00

Commit Message:
TINSEL: Add detection for the Discworld Noir Demo

Changed paths:
    engines/tinsel/detection_tables.h


diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 3948fb6ee8..e75ff5e703 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -829,6 +829,25 @@ static const TinselGameDescription gameDescriptions[] = {
 		TINSEL_V3,
 	},
 
+	{ // Discworld Noir, Interactive Windows Demo
+		{
+			"noir",
+			"Demo",
+			{
+				{"english.smp", 0, "ecca3ec84ad6460bf289e6171ac32048", 73494004},
+				{"dw3.scn", 0, "f8e50c19b44a2c6eaee5f78654647878", 803781},
+				{NULL, 0, NULL, 0}
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE | ADGF_DEMO
+		},
+		GID_NOIR,
+		0,
+		GF_SCNFILES,
+		TINSEL_V3,
+	},
+
 	{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
 };
 


Commit: afdc87d99f0c3a75408916c291ec43088848ad59
    https://github.com/scummvm/scummvm/commit/afdc87d99f0c3a75408916c291ec43088848ad59
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2020-10-31T00:09:03+01:00

Commit Message:
TINSEL: Error out when trying to start Discworld Noir for now.

Changed paths:
    engines/tinsel/tinsel.cpp


diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index c532744d63..901d3fd6f3 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -970,7 +970,9 @@ Common::Error TinselEngine::run() {
 	_dialogs = new Dialogs();
 
 	// Initialize backend
-	if (getGameID() == GID_DW2) {
+	if (getGameID() == GID_NOIR) {
+		error("Discworld Noir is not yet supported");
+	} else if (getGameID() == GID_DW2) {
 #ifndef DW2_EXACT_SIZE
 		initGraphics(640, 480);
 #else