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

[dreammaster]

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:
d21bc7df8b GLK: ALAN2: Add detection entry for Hollywood Murders


Commit: d21bc7df8b991c60eb542dd38c58e32ec430d0db
    https://github.com/scummvm/scummvm/commit/d21bc7df8b991c60eb542dd38c58e32ec430d0db
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-10-04T20:30:35-07:00

Commit Message:
GLK: ALAN2: Add detection entry for Hollywood Murders

It's an unsupported earlier 2.6 game, but at least
this way it'll be recognised as such rather than
not being dtected at all.

Changed paths:
    engines/glk/alan2/alan2.cpp
    engines/glk/alan2/detection.cpp
    engines/glk/alan2/detection_tables.h


diff --git a/engines/glk/alan2/alan2.cpp b/engines/glk/alan2/alan2.cpp
index 3d18a43fa7b..177884a571e 100644
--- a/engines/glk/alan2/alan2.cpp
+++ b/engines/glk/alan2/alan2.cpp
@@ -76,7 +76,8 @@ bool Alan2::initialize() {
 		return false;
 	}
 
-	if (_gameFile.readUint32BE() != MKTAG(2, 8, 1, 0)) {
+	uint32 version = _gameFile.readUint32BE();
+	if (version != MKTAG(2, 8, 1, 0) && version != MKTAG(2, 6, 0, 0)) {
 		GUIErrorMessage(_("This is not a valid Alan2 file."));
 		return false;
 	}
diff --git a/engines/glk/alan2/detection.cpp b/engines/glk/alan2/detection.cpp
index f578600fb0d..bdfbae905a7 100644
--- a/engines/glk/alan2/detection.cpp
+++ b/engines/glk/alan2/detection.cpp
@@ -57,7 +57,10 @@ bool Alan2MetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 
 		// Open up the file and calculate the md5
 		Common::File gameFile;
-		if (!gameFile.open(*file) || gameFile.readUint32BE() != MKTAG(2, 8, 1, 0))
+		if (!gameFile.open(*file))
+			continue;
+		uint32 version = gameFile.readUint32BE();
+		if (version != MKTAG(2, 8, 1, 0) && version != MKTAG(2, 6, 0, 0))
 			continue;
 
 		gameFile.seek(0);
diff --git a/engines/glk/alan2/detection_tables.h b/engines/glk/alan2/detection_tables.h
index 772edf7baaf..aed35a91c12 100644
--- a/engines/glk/alan2/detection_tables.h
+++ b/engines/glk/alan2/detection_tables.h
@@ -29,6 +29,10 @@ namespace Alan2 {
 const PlainGameDescriptor ALAN2_GAME_LIST[] = {
 	{ "alan2", "Alan2 Game" },
 
+	// Unsupported 2.6 games
+	{ "hollywoodmurders", "The Hollywood Murders" },
+
+	// Supported 2.8.1 games
 	{ "bugged", "Bugged" },
 	{ "cc", "CC" },
 	{ "chasing", "The Chasing" },
@@ -52,6 +56,10 @@ const PlainGameDescriptor ALAN2_GAME_LIST[] = {
 };
 
 const GlkDetectionEntry ALAN2_GAMES[] = {
+	// Unsupported 2.6 games
+	DT_ENTRY0("hollywoodmurders", "e6da6dfa85dd471a251ce485af710730", 95232),
+
+	// Supported 2.8.1 games
 	DT_ENTRY0("bugged", "f4eed3db3771a456143744a0e36653db", 112640),
 	DT_ENTRY0("cc", "47f4a5436ce07d65bb828e2938f81952", 53248),
 	DT_ENTRY1("chasing", "1.0", "10ad37b6dd6d9f399578b28e644914ca", 144384),