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

[dreammaster]

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:
b4f8a050f4 GLK: SCOTT: Fix game detection
da67efb306 GLK: SCOTT: Add detection for 11 Mysterious Adventures (C64)


Commit: b4f8a050f4a2cb453c9a65ada71db37c77071075
    https://github.com/scummvm/scummvm/commit/b4f8a050f4a2cb453c9a65ada71db37c77071075
Author: Avijeet (am388488 at gmail.com)
Date: 2022-05-29T10:01:25-07:00

Commit Message:
GLK: SCOTT: Fix game detection

Only the filesize was being matched because of a wrong condition.
This commit fixes that to also consider the md5 hash.

Changed paths:
    engines/glk/scott/detection.cpp


diff --git a/engines/glk/scott/detection.cpp b/engines/glk/scott/detection.cpp
index d936d316b64..a8954c230e6 100644
--- a/engines/glk/scott/detection.cpp
+++ b/engines/glk/scott/detection.cpp
@@ -73,7 +73,7 @@ bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 
 		// Scan through the Scott game list for a match
 		const GlkDetectionEntry *p = SCOTT_GAMES;
-		while (p->_md5 && p->_filesize != filesize && md5 != p->_md5)
+		while (p->_md5 && (p->_filesize != filesize || md5 != p->_md5))
 			++p;
 
 		if (!p->_gameId) {


Commit: da67efb3067ab4edcbe050ca0b182149d9161e4d
    https://github.com/scummvm/scummvm/commit/da67efb3067ab4edcbe050ca0b182149d9161e4d
Author: Avijeet (am388488 at gmail.com)
Date: 2022-05-29T10:01:25-07:00

Commit Message:
GLK: SCOTT: Add detection for 11 Mysterious Adventures (C64)

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


diff --git a/engines/glk/scott/detection.cpp b/engines/glk/scott/detection.cpp
index a8954c230e6..d3569b18494 100644
--- a/engines/glk/scott/detection.cpp
+++ b/engines/glk/scott/detection.cpp
@@ -44,7 +44,7 @@ GameDescriptor ScottMetaEngine::findGame(const char *gameId) {
 }
 
 bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) {
-	const char *const EXTENSIONS[] = { ".z80", ".saga", ".dat", nullptr };
+	const char *const EXTENSIONS[] = {".z80", ".saga", ".dat", ".D64", nullptr};
 
 	// Loop through the files of the folder
 	for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
diff --git a/engines/glk/scott/detection_tables.h b/engines/glk/scott/detection_tables.h
index 205828520fb..01d25e66caf 100644
--- a/engines/glk/scott/detection_tables.h
+++ b/engines/glk/scott/detection_tables.h
@@ -59,6 +59,8 @@ const PlainGameDescriptor SCOTT_GAME_LIST[] = {
 	{ "perseus", "Mysterious Adventures 9: Perseus and Andromeda" },
 	{ "10indians", "Mysterious Adventures 10: Ten Little Indians" },
 	{ "waxworks11", "Mysterious Adventures 11: Waxworks" },
+	{ "mysadv1", "11 Mysterious Adventures - Disk 1"},
+	{ "mysadv2", "11 Mysterious Adventures - Disk 2"},
 
 	// Other Games
 	{ "desert",            "Desert Adventure" },
@@ -162,6 +164,11 @@ const GlkDetectionEntry SCOTT_GAMES[] = {
 	DT_ENTRY1("perseus", "ZXSpectrum", "84d5fbb16a37e495abf09d191fd8b1a2", 31504),
 	DT_ENTRY1("10indians", "ZXSpectrum", "afde056c152de79ea20453c42a2d08af", 31664),
 	DT_ENTRY1("waxworks11", "ZXSpectrum", "6c6fbbbb50032463a6ea71c6750ea1f5", 32662),
+
+	//C64 Games
+	//11 Mysterious Adventures
+	DT_ENTRY1("mysadv1", "C64", "ce5a68cf43b2f29d99c0135b89f4fe31", 174848),
+	DT_ENTRY1("mysadv2", "C64", "1e1ff48f80a8220f5ab9d14c975197b8", 174848),
 	DT_END_MARKER
 };