[Scummvm-cvs-logs] scummvm master -> 4a885af83a21af25d4d26cf768871aa2bcebb69e

[criezy]

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:
4a885af83a MORTEVIELLE: Improve reading of menu file


Commit: 4a885af83a21af25d4d26cf768871aa2bcebb69e
    https://github.com/scummvm/scummvm/commit/4a885af83a21af25d4d26cf768871aa2bcebb69e
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-08-16T02:47:11-07:00

Commit Message:
MORTEVIELLE: Improve reading of menu file

Do not try to read the menu.mor file as it has a different format not
supported (and detection for it was already removed). Also only tries
to read the menu for the original language. This avoids using the
French menu with the German game when both files are present in
the search path.

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



diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index 7d0f3c4..8e2eab5 100644
--- a/engines/mortevielle/detection.cpp
+++ b/engines/mortevielle/detection.cpp
@@ -36,6 +36,8 @@ uint32 MortevielleEngine::getGameFlags() const { return _gameDescription->desc.f
 
 Common::Language MortevielleEngine::getLanguage() const { return _gameDescription->desc.language; }
 
+Common::Language MortevielleEngine::getOriginalLanguage() const { return _gameDescription->originalLanguage; }
+
 }
 
 static const PlainGameDescriptor MortevielleGame[] = {
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index 67199b9..7962c17 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -638,11 +638,13 @@ void Menu::initMenu() {
 	}
 
 	if (!enMenuLoaded) {
-		if (!f.open("menufr.mor"))
+		if (_vm->getOriginalLanguage() == Common::FR_FRA) {
+			if (!f.open("menufr.mor"))
+				error("Missing file - menufr.mor");
+		} else { // Common::DE_DEU
 			if (!f.open("menual.mor"))
-				if (!f.open("menu.mor"))
-					error("Missing file - menufr.mor or menual.mor or menu.mor");
-
+				error("Missing file - menual.mor");
+		}
 		f.read(_charArr, 7 * 24);
 		f.close();
 	}
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 27a3d56..d3930f7 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -461,6 +461,7 @@ public:
 	virtual Common::Error run();
 	uint32 getGameFlags() const;
 	Common::Language getLanguage() const;
+	Common::Language getOriginalLanguage() const;
 	static Common::String generateSaveFilename(const Common::String &target, int slot);
 	Common::String generateSaveFilename(int slot) { return generateSaveFilename(_targetName, slot); }