aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2007-04-21 21:31:53 +0000
committerEugene Sandulenko2007-04-21 21:31:53 +0000
commit873efee47ffc540a4f5af02a746811fb6b5d88ee (patch)
tree54c51f0ac664c3875235ecdf047c92e11911c879 /engines
parent28e721836a959f0283c00aae49dcb0481091e387 (diff)
downloadscummvm-rg350-873efee47ffc540a4f5af02a746811fb6b5d88ee.tar.gz
scummvm-rg350-873efee47ffc540a4f5af02a746811fb6b5d88ee.tar.bz2
scummvm-rg350-873efee47ffc540a4f5af02a746811fb6b5d88ee.zip
Slighty modified patch #1661777: "SCUMM: allow non-english DIG and COMI
to be set to English" svn-id: r26559
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/string.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 6236403941..b255737fa3 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1230,6 +1230,14 @@ void ScummEngine_v7::loadLanguageBundle() {
ScummFile file;
int32 size;
+ // if game is manually set to English, don't try to load localized text
+ if ((_language == Common::EN_ANY) || (_language == Common::EN_USA) || (_language == Common::EN_GRB)) {
+ warning("Language file is forced to be ignored");
+
+ _existLanguageFile = false;
+ return;
+ }
+
if (_game.id == GID_DIG) {
openFile(file, "language.bnd");
} else if (_game.id == GID_CMI) {