diff options
| author | Max Horn | 2010-06-28 11:21:55 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-28 11:21:55 +0000 |
| commit | 85038e7d6c272555c54d9f4b87665392bfa96aaf (patch) | |
| tree | c40c4e8177fd303349a083db0b90860a221dab86 /engines/sci/engine/script.cpp | |
| parent | 12099176f712c65b9822a5874f705d63d82228ce (diff) | |
| download | scummvm-rg350-85038e7d6c272555c54d9f4b87665392bfa96aaf.tar.gz scummvm-rg350-85038e7d6c272555c54d9f4b87665392bfa96aaf.tar.bz2 scummvm-rg350-85038e7d6c272555c54d9f4b87665392bfa96aaf.zip | |
SCI: Change warning back to error in Script::initialiseObjectsSci0
Instead of turning the error into a warning globally, we now have
code which ignores the error in Script 202 of KQ5 French, but will
keep reporting if it turns up in other places.
svn-id: r50427
Diffstat (limited to 'engines/sci/engine/script.cpp')
| -rw-r--r-- | engines/sci/engine/script.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index b6bcbb7646..f9584a2897 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -471,8 +471,11 @@ void Script::initialiseObjectsSci0(SegManager *segMan) { obj->initSpecies(segMan, addr); if (!obj->initBaseObject(segMan, addr)) { - // Script 202 of KQ5 French has an invalid object. This is non-fatal. - warning("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(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. + } else { + error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr)); + } scriptObjRemove(addr); } } |