diff options
| author | Filippos Karapetis | 2010-07-29 15:50:53 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-29 15:50:53 +0000 |
| commit | c61ed6e3aafeb6bd3ef200ee81b9912291b224a7 (patch) | |
| tree | 78c3f33a73ab870717d2b097d9950a8503cfd5c0 /engines/sci | |
| parent | 123d1f6bf6a489fc7333292e2c34b8ff38276097 (diff) | |
| download | scummvm-rg350-c61ed6e3aafeb6bd3ef200ee81b9912291b224a7.tar.gz scummvm-rg350-c61ed6e3aafeb6bd3ef200ee81b9912291b224a7.tar.bz2 scummvm-rg350-c61ed6e3aafeb6bd3ef200ee81b9912291b224a7.zip | |
SCI: Removed the language check from the
KQ5 workaround, as there could be an issue
with other non-English versions, too (e.g.
the Spanish floppy version)
svn-id: r51472
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 469fada5ba..645094d9ec 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -474,10 +474,10 @@ void Script::initialiseObjectsSci0(SegManager *segMan, SegmentId segmentId) { obj->initSpecies(segMan, addr); if (!obj->initBaseObject(segMan, addr)) { - if (_nr == 202 && g_sci->getGameId() == GID_KQ5 && - (g_sci->getSciLanguage() == K_LANG_FRENCH || g_sci->getSciLanguage() == K_LANG_GERMAN)) { - // WORKAROUND: Script 202 of KQ5 French and German has an invalid object. This is non-fatal. - // Refer to bug #3035396. + if (_nr == 202 && g_sci->getGameId() == GID_KQ5) { + // WORKAROUND: Script 202 of KQ5 French and German + // (perhaps Spanish too?) has an invalid object. + // This is non-fatal. Refer to bug #3035396. } else { error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr)); } |