aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2015-08-19 23:01:44 +0200
committerStrangerke2015-08-19 23:03:44 +0200
commit3ec6dccc4fd4a176dec263d52978899e4196cff2 (patch)
tree3cb8ca483a4cf5ccf74c2efcad2877c7ed395877
parentbc839e4c3f7361120790bbaf42af8a0528c9281a (diff)
downloadscummvm-rg350-3ec6dccc4fd4a176dec263d52978899e4196cff2.tar.gz
scummvm-rg350-3ec6dccc4fd4a176dec263d52978899e4196cff2.tar.bz2
scummvm-rg350-3ec6dccc4fd4a176dec263d52978899e4196cff2.zip
MORTVILLE: Add detection for the version reported in #6575
-rw-r--r--engines/mortevielle/detection_tables.h17
-rw-r--r--engines/mortevielle/menu.cpp9
2 files changed, 24 insertions, 2 deletions
diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index d244d15365..26611d4271 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 c0b81b252a..b788ce9a71 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");