libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Change warning back to error in Script::initialiseObjectsSci0

Browse Source 
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
This commit is contained in:
Max Horn 2010-06-28 11:21:55 +00:00
parent 12099176f7
commit 85038e7d6c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sci/engine/script.cpp
View File

@ -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);
}
}