[Scummvm-git-logs] scummvm master -> 32bcd55d6c479b88c247b1bae084346a883fed58

[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:
32bcd55d6c MM: MM1: Add direct detection for the Graphics Overhauld Mod.


Commit: 32bcd55d6c479b88c247b1bae084346a883fed58
    https://github.com/scummvm/scummvm/commit/32bcd55d6c479b88c247b1bae084346a883fed58
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-06-10T09:20:45-07:00

Commit Message:
MM: MM1: Add direct detection for the Graphics Overhauld Mod.

We don't support running the game directly from it, since doing
so would bypass the need for the original game. But at least
this way, it will be recognised, and users will be given an
informative message of why the game won't run.

Changed paths:
    engines/mm/detection.h
    engines/mm/detection_tables.h
    engines/mm/mm1/mm1.cpp


diff --git a/engines/mm/detection.h b/engines/mm/detection.h
index f5ddda500e2..df26fa4dc0f 100644
--- a/engines/mm/detection.h
+++ b/engines/mm/detection.h
@@ -36,7 +36,8 @@ enum {
 
 enum GameFeature {
 	GF_NONE = 0,
-	GF_ENHANCED = 1
+	GF_ENHANCED = 1,
+	GF_GFX_PACK = 2
 };
 
 struct MightAndMagicGameDescription {
diff --git a/engines/mm/detection_tables.h b/engines/mm/detection_tables.h
index f728e5d8eda..e0e07e0ac8e 100644
--- a/engines/mm/detection_tables.h
+++ b/engines/mm/detection_tables.h
@@ -52,6 +52,23 @@ static const MightAndMagicGameDescription GAME_DESCRIPTIONS[] = {
 		GType_MightAndMagic1,
 		GF_ENHANCED
 	},
+
+	{
+		// Might and Magic 1 (Gfx Pack)
+		// This isn't directly supported, because using it would allow playing
+		// the game without actually having the original game files
+		{
+			"mm1",
+			nullptr,
+			AD_ENTRY1s("wallpix.dta", "64af4dad1f86aedf307e8184a9f12ba9", 164220),
+			Common::EN_ANY,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO0()
+		},
+		GType_MightAndMagic1,
+		GF_GFX_PACK
+	},
 #endif
 
 #ifdef ENABLE_XEEN
diff --git a/engines/mm/mm1/mm1.cpp b/engines/mm/mm1/mm1.cpp
index 9fe58817ecd..f0149e3144c 100644
--- a/engines/mm/mm1/mm1.cpp
+++ b/engines/mm/mm1/mm1.cpp
@@ -52,6 +52,13 @@ MM1Engine::~MM1Engine() {
 }
 
 Common::Error MM1Engine::run() {
+	if (_gameDescription->features & GF_GFX_PACK) {
+		GUIErrorMessage(_("You cannot run the game directly from the Graphics Overhaul Mod. "
+			"Instead, it will automatically be available if you detect the original game "
+			"and select Enhanced mode."));
+		return Common::kNoError;
+	}
+
 	// Initialize graphics mode
 	initGraphics(320, 200);