[Scummvm-cvs-logs] scummvm master -> 3ec6dccc4fd4a176dec263d52978899e4196cff2

[Strangerke]

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:
3ec6dccc4f MORTVILLE: Add detection for the version reported in #6575


Commit: 3ec6dccc4fd4a176dec263d52978899e4196cff2
    https://github.com/scummvm/scummvm/commit/3ec6dccc4fd4a176dec263d52978899e4196cff2
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-08-19T23:03:44+02:00

Commit Message:
MORTVILLE: Add detection for the version reported in #6575

Changed paths:
    engines/mortevielle/detection_tables.h
    engines/mortevielle/menu.cpp



diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index d244d15..26611d4 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -110,6 +110,23 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
 		}, Common::DE_DEU, kUseEngineDataFile
 	},
 
+	// French, provided by ultrapingu in bug ref #6575
+	{
+		{
+			"mortevielle",
+			"",
+			{
+				{"menu.mor", 0, "3fef0a3f8fca99fdcb6dbca8cbcef46f", 160},
+				{"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
+				AD_LISTEND
+			},
+			Common::FR_FRA,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUIO0()
+		}, Common::FR_FRA, kUseOriginalData
+	},
+
 	{ AD_TABLE_END_MARKER , Common::EN_ANY, kUseEngineDataFile}
 };
 
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index c0b81b2..b788ce9 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -682,8 +682,13 @@ void Menu::initMenu() {
 	if (!menuLoaded) {
 		// Load menu from game data using the original language
 		if (_vm->getOriginalLanguage() == Common::FR_FRA) {
-			if (!f.open("menufr.mor"))
-				error("Missing file - menufr.mor");
+			if (f.exists("menufr.mor")) {
+				if (!f.open("menufr.mor"))
+					error("Missing file - menufr.mor");
+			} else {
+				if (!f.open("menu.mor"))
+					error("Missing file - menu.mor");
+			}
 		} else { // Common::DE_DEU
 			if (!f.open("menual.mor"))
 				error("Missing file - menual.mor");