diff options
| author | Thierry Crozat | 2015-09-14 22:28:42 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2015-09-14 22:29:23 +0100 |
| commit | fc7df50ed0e81aa694c7d6dbd97dbd962943702b (patch) | |
| tree | 1d46238f7c30e8239a67d965265f9c7d39fc9413 /engines | |
| parent | 97aa214e89b4005a3d08ca5a7246e7bf8597e1c1 (diff) | |
| download | scummvm-rg350-fc7df50ed0e81aa694c7d6dbd97dbd962943702b.tar.gz scummvm-rg350-fc7df50ed0e81aa694c7d6dbd97dbd962943702b.tar.bz2 scummvm-rg350-fc7df50ed0e81aa694c7d6dbd97dbd962943702b.zip | |
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.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mortevielle/menu.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp index b788ce9a71..6235e9f2ed 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"); |