diff options
| author | Strangerke | 2012-06-01 18:11:41 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-03-28 17:36:57 +0200 |
| commit | 747734a6975dcdabb703d994a3210762d733721b (patch) | |
| tree | 4a7586cd62909e6d6ac9e979af9e3d6396a58fed | |
| parent | 147a450834cd4a89b7dcf004eb098ef3558d6b18 (diff) | |
| download | scummvm-rg350-747734a6975dcdabb703d994a3210762d733721b.tar.gz scummvm-rg350-747734a6975dcdabb703d994a3210762d733721b.tar.bz2 scummvm-rg350-747734a6975dcdabb703d994a3210762d733721b.zip | |
LILLIPUT: Fix regression in checkMapClosing, handle properly other languages
| -rw-r--r-- | engines/lilliput/lilliput.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp index 7a99fd683a..7191b10332 100644 --- a/engines/lilliput/lilliput.cpp +++ b/engines/lilliput/lilliput.cpp @@ -999,7 +999,7 @@ void LilliputEngine::checkMapClosing(bool &forceReturnFl) { debugC(2, kDebugEngineTBC, "checkMapClosing()"); forceReturnFl = false; - if (_displayMap) + if (!_displayMap) return; pollEvent(); @@ -2447,8 +2447,25 @@ void LilliputEngine::loadRules() { Common::File f; uint16 curWord; - if (!f.open("ERULES.PRG")) - error("Missing game file ERULES.PRG"); + Common::String filename = "ERULES.PRG"; + Common::Language lang = Common::parseLanguage(ConfMan.get("language")); + + switch (lang) { + case Common::FR_FRA: + filename = "FRULES.PRG"; + break; + case Common::IT_ITA: + filename = "IRULES.PRG"; + break; + case Common::DE_DEU: + filename = "GRULES.PRG"; + break; + default: + warning("unsupported language, switching back to English"); + } + + if (!f.open(filename)) + error("Missing game file %s", filename.c_str()); _word10800_ERULES = f.readUint16LE(); |