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

[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:
f561f37a01 GLK: MAGNETIC: Add game detection entries


Commit: f561f37a01a5d7f498e9f552680ef4730012bab5
    https://github.com/scummvm/scummvm/commit/f561f37a01a5d7f498e9f552680ef4730012bab5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-07T16:37:15+10:00

Commit Message:
GLK: MAGNETIC: Add game detection entries

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


diff --git a/engines/glk/magnetic/detection.cpp b/engines/glk/magnetic/detection.cpp
index db899a2..83d1143 100644
--- a/engines/glk/magnetic/detection.cpp
+++ b/engines/glk/magnetic/detection.cpp
@@ -46,7 +46,7 @@ GameDescriptor MagneticMetaEngine::findGame(const char *gameId) {
 }
 
 bool MagneticMetaEngine::detectGames(const Common::FSList &fslist, DetectedGames &gameList) {
-	const char *const EXTENSIONS[] = { ".rsc", nullptr };
+	const char *const EXTENSIONS[] = { ".mag", ".rsc", 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/magnetic/detection_tables.h b/engines/glk/magnetic/detection_tables.h
index 18d3b84..7476c34 100644
--- a/engines/glk/magnetic/detection_tables.h
+++ b/engines/glk/magnetic/detection_tables.h
@@ -41,13 +41,30 @@ struct MagneticGameDescription {
 const PlainGameDescriptor MAGNETIC_GAME_LIST[] = {
 	{ "magnetic", "Magnetic Scrolls Game" },
 
+	{ "corruption", "Corruption" },
+	{ "fish", "Fish!" },
+	{ "guild", "The Guild of Thieves" },
+	{ "myth", "Myth" },
+	{ "pawn", "the Pawn" },
+	{ "wonderland", "Wonderland" },
+
 	{ nullptr, nullptr }
 };
 
 #define ENTRY0(ID, MD5, FILESIZE) { ID, nullptr, MD5, FILESIZE, Common::EN_ANY }
+#define ENTRY1(ID, EXTRA, MD5, FILESIZE) { ID, EXTRA, MD5, FILESIZE, Common::EN_ANY }
 #define TABLE_END_MARKER { nullptr, nullptr, nullptr, 0, Common::EN_ANY }
 
 const MagneticGameDescription MAGNETIC_GAMES[] = {
+	ENTRY0("corruption", "313880cbe0f15bfa259ebaf228b4d0e9", 167466),
+	ENTRY1("corruption", "Collection", "6fe35b357fa0311450d3a9c809e60ba8", 177185),
+	ENTRY0("fish", "2efb8118f4cb9a36bb54646ce41a950e", 162858),
+	ENTRY1("fish", "Collection", "cfe333306597d36c8aa3fc64f6be94ba", 172517),
+	ENTRY0("guild", "bab78740d39ee5e058faf4912fdbf33d", 130858),
+	ENTRY1("guild", "Collection", "36af907a4ec9db909148f308287586f1", 141766),
+	ENTRY0("myth", "9c2a5272a9c0b1e173401ba4df32567a", 99370),
+	ENTRY0("pawn", "4a7847980f9e942acd7aa51ea12a6586", 103466),
+	ENTRY0("wonderland", "2cea8fccf42d570be8836416c2802613", 183916),
 	TABLE_END_MARKER
 };
 
diff --git a/engines/glk/magnetic/magnetic.h b/engines/glk/magnetic/magnetic.h
index 6cf05c9..04f1333 100644
--- a/engines/glk/magnetic/magnetic.h
+++ b/engines/glk/magnetic/magnetic.h
@@ -188,7 +188,7 @@ public:
 	/**
 	 * Returns the running interpreter type
 	 */
-	virtual InterpreterType getInterpreterType() const override { return INTERPRETER_GLULXE; }
+	virtual InterpreterType getInterpreterType() const override { return INTERPRETER_MAGNETIC; }
 
 	/**
 	 * Load a savegame from the passed stream