[Scummvm-cvs-logs] scummvm master -> fc7df50ed0e81aa694c7d6dbd97dbd962943702b

[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:
fc7df50ed0 MORTEVIELLE: Do not try to use menu.mor file


Commit: fc7df50ed0e81aa694c7d6dbd97dbd962943702b
    https://github.com/scummvm/scummvm/commit/fc7df50ed0e81aa694c7d6dbd97dbd962943702b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-09-14T22:29:23+01:00

Commit Message:
MORTEVIELLE: Do not try to use menu.mor file

This file has a different format from menufr.mor and menual.mor and
we don't support it. Trying to use this file would lead to wrong menu.
If the game version does not contain menufr.mor it has to get the
menu from the DAT file.

Changed paths:
    engines/mortevielle/menu.cpp



diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index b788ce9..6235e9f 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -682,13 +682,10 @@ void Menu::initMenu() {
 	if (!menuLoaded) {
 		// Load menu from game data using the original language
 		if (_vm->getOriginalLanguage() == Common::FR_FRA) {
-			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");
-			}
+			// We do not support reading menu.mor (it has a different format).
+			// If the game version does not have menufr.mor it has to get the menu from the DAT file.
+			if (!f.open("menufr.mor"))
+				error("Missing file - menufr.mor");
 		} else { // Common::DE_DEU
 			if (!f.open("menual.mor"))
 				error("Missing file - menual.mor");