diff options
| author | Filippos Karapetis | 2010-07-29 15:40:09 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-29 15:40:09 +0000 |
| commit | 123d1f6bf6a489fc7333292e2c34b8ff38276097 (patch) | |
| tree | 59016c19e3177b86f9ea10d0fc821214cc96994e | |
| parent | 9b6c78a4fed90b5b9fa98e77994f74645ee5fb47 (diff) | |
| download | scummvm-rg350-123d1f6bf6a489fc7333292e2c34b8ff38276097.tar.gz scummvm-rg350-123d1f6bf6a489fc7333292e2c34b8ff38276097.tar.bz2 scummvm-rg350-123d1f6bf6a489fc7333292e2c34b8ff38276097.zip | |
Extended the workaround for KQ5 French floppy for the German floppy too. Fixes bug #3035396 - "KQ5: Crash when start the game"
svn-id: r51471
| -rw-r--r-- | engines/sci/engine/script.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 6f4c272649..469fada5ba 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -474,8 +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) { - // Script 202 of KQ5 French has an invalid object. This is non-fatal. + 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. } else { error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr)); } |