diff options
| author | Filippos Karapetis | 2010-06-27 16:02:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-27 16:02:03 +0000 |
| commit | d7f212647a115b011db7c37f5bcdd6a5eae62235 (patch) | |
| tree | e6ea03acd84576ee6fa47c95222f90c6ab74b5bf /engines/sci | |
| parent | 01bfcf98cc2bb5e135549b3e0cbdc4f3fe57e5ee (diff) | |
| download | scummvm-rg350-d7f212647a115b011db7c37f5bcdd6a5eae62235.tar.gz scummvm-rg350-d7f212647a115b011db7c37f5bcdd6a5eae62235.tar.bz2 scummvm-rg350-d7f212647a115b011db7c37f5bcdd6a5eae62235.zip | |
Turned the error when failing to locate an invalid object back to a warning (KQ5 French has an invalid object in script 202)
svn-id: r50379
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/script.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index f26a2e53af..b3fbafb355 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -224,8 +224,9 @@ void SegManager::scriptInitialiseObjectsSci0(SegmentId seg) { obj->initSpecies(this, addr); if (!obj->initBaseObject(this, addr)) { - error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr)); - //scr->scriptObjRemove(addr); + // Script 202 of KQ5 French has an invalid object + warning("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr)); + scr->scriptObjRemove(addr); } } break; |