From 672cfbd518626fffc3476c2f6d0cdd391ab12e17 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sat, 1 Jul 2017 14:02:06 +0200
Subject: MOHAWK: Set GUI option flags to disable unneeded settings for Riven

---
 engines/mohawk/detection_tables.h | 55 +++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 7da3c14633..ba557012b9 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -29,6 +29,9 @@ namespace Mohawk {
 #define GUI_OPTIONS_MYST_DEMO              GUIO4(GUIO_NOASPECT, GUIO_NOSUBTITLES, GUIO_NOMIDI, GUIO_NOLAUNCHLOAD)
 #define GUI_OPTIONS_MYST_MAKING_OF         GUIO4(GUIO_NOASPECT, GUIO_NOSUBTITLES, GUIO_NOMIDI, GUIO_NOLAUNCHLOAD)
 
+#define GUI_OPTIONS_RIVEN                  GUIO4(GUIO_NOASPECT, GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOMIDI)
+#define GUI_OPTIONS_RIVEN_DEMO             GUIO5(GUIO_NOASPECT, GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_NOLAUNCHLOAD)
+
 static const MohawkGameDescription gameDescriptions[] = {
 	// Myst
 	// English Windows 3.11
@@ -311,7 +314,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -329,7 +332,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -347,7 +350,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::ES_ESP,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -358,18 +361,18 @@ static const MohawkGameDescription gameDescriptions[] = {
 	// Version 1.0 (5CD), 1.02 (DVD, From "Myst: La Trilogie")
 	// From gamin
 	{
-			{
-					"riven",
-					"",
-					AD_ENTRY1("a_Data.MHK", "aff2a384aaa9a0e0ec51010f708c5c04"),
-					Common::FR_FRA,
-					Common::kPlatformWindows,
-					ADGF_UNSTABLE,
-					GUIO1(GUIO_NOASPECT)
-			},
-			GType_RIVEN,
-			0,
-			0,
+		{
+			"riven",
+			"",
+			AD_ENTRY1("a_Data.MHK", "aff2a384aaa9a0e0ec51010f708c5c04"),
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE,
+			GUI_OPTIONS_RIVEN
+		},
+		GType_RIVEN,
+		0,
+		0,
 	},
 
 	// Riven: The Sequel to Myst
@@ -383,7 +386,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::IT_ITA,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -400,7 +403,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::RU_RUS,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -417,7 +420,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::RU_RUS,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -436,7 +439,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::JA_JPN,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -454,7 +457,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		GF_DVD,
@@ -472,7 +475,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::DE_DEU,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		GF_DVD,
@@ -490,7 +493,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::PL_POL,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		GF_DVD,
@@ -507,7 +510,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::RU_RUS,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		GF_DVD,
@@ -525,7 +528,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_DEMO | ADGF_UNSTABLE,
-			GUIO2(GUIO_NOASPECT, GUIO_NOLAUNCHLOAD)
+			GUI_OPTIONS_RIVEN_DEMO
 		},
 		GType_RIVEN,
 		GF_DEMO,
@@ -2837,7 +2840,7 @@ static const MohawkGameDescription fallbackDescs[] = {
 			Common::UNK_LANG,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		0,
@@ -2852,7 +2855,7 @@ static const MohawkGameDescription fallbackDescs[] = {
 			Common::UNK_LANG,
 			Common::kPlatformWindows,
 			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOASPECT)
+			GUI_OPTIONS_RIVEN
 		},
 		GType_RIVEN,
 		GF_DVD,
-- 
cgit v1.2.3