[Scummvm-git-logs] scummvm master -> 2d33e5d318b6e43417dbfe94859075cafced0f17

[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:
611dea205c GLK: SCOTT: Add missing fallback detection entry
2d33e5d318 GLK: SCOTT: Ignore common extensions to prevent mass add flooding


Commit: 611dea205c43028068fa31c1ee0638288074c4b0
    https://github.com/scummvm/scummvm/commit/611dea205c43028068fa31c1ee0638288074c4b0
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2022-10-20T18:56:42-07:00

Commit Message:
GLK: SCOTT: Add missing fallback detection entry

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


diff --git a/engines/glk/scott/detection_tables.h b/engines/glk/scott/detection_tables.h
index cf2e98a11aa..505ae9ec552 100644
--- a/engines/glk/scott/detection_tables.h
+++ b/engines/glk/scott/detection_tables.h
@@ -38,6 +38,8 @@ namespace Glk {
 namespace Scott {
 
 const PlainGameDescriptor SCOTT_GAME_LIST[] = {
+	{ "scottadams",			"Scott Adams IF Game" },
+
 	// Scott Adams games
 	{ "adventureland",		"Adventureland" },
 	{ "pirateadventure",	"Pirate Adventure" },


Commit: 2d33e5d318b6e43417dbfe94859075cafced0f17
    https://github.com/scummvm/scummvm/commit/2d33e5d318b6e43417dbfe94859075cafced0f17
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2022-10-20T18:56:42-07:00

Commit Message:
GLK: SCOTT: Ignore common extensions to prevent mass add flooding

Avoid picking any .d64 (Commodore disc) or .t64 (Commodore tape)
as a possible Scott game, to prevent conflicts with the detection of
Maniac Mansion / Zak C64 and possibile flooding in mass-add.

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


diff --git a/engines/glk/scott/detection.cpp b/engines/glk/scott/detection.cpp
index 377c8814fdb..43af6e772ab 100644
--- a/engines/glk/scott/detection.cpp
+++ b/engines/glk/scott/detection.cpp
@@ -93,7 +93,10 @@ bool ScottMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &g
 			++p;
 
 		if (!p->_gameId) {
-			if (!isBlorb && filename.hasSuffixIgnoreCase(".dat"))
+
+			// ignore possible variants for common extensions to prevent flooding in mass-add
+			if (!isBlorb && (filename.hasSuffixIgnoreCase(".z80") || filename.hasSuffixIgnoreCase(".dat") ||
+				filename.hasSuffixIgnoreCase(".d64") || filename.hasSuffixIgnoreCase(".t64")))
 				continue;
 
 			const PlainGameDescriptor &desc = SCOTT_GAME_LIST[0];