diff options
| author | Travis Howell | 2007-07-28 08:05:47 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-07-28 08:05:47 +0000 |
| commit | fb99c11af28f5f010d741992fd0fa54d1616dcff (patch) | |
| tree | 934f9a61a00eec69486d948af226bd528d6466ff /engines/agos | |
| parent | d764dca90f157fb9c99491874f60013991502e25 (diff) | |
| download | scummvm-rg350-fb99c11af28f5f010d741992fd0fa54d1616dcff.tar.gz scummvm-rg350-fb99c11af28f5f010d741992fd0fa54d1616dcff.tar.bz2 scummvm-rg350-fb99c11af28f5f010d741992fd0fa54d1616dcff.zip | |
Switch error back to debug message, due to strange data in restart state files.
svn-id: r28258
Diffstat (limited to 'engines/agos')
| -rw-r--r-- | engines/agos/items.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index 13034b74c9..b2e722d681 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -382,8 +382,13 @@ int AGOSEngine::wordMatch(Item *item, int16 a, int16 n) { } Item *AGOSEngine::derefItem(uint item) { - if (item >= _itemArraySize) - error("derefItem: invalid item %d", item); + // Occurs when loading item store from restart state in + // Elvira 2 (Amiga/AtariST) and Waxworks (Amiga). + if (item >= _itemArraySize) { + debug(0, "derefItem: invalid item %d", item); + return NULL; + } + return _itemArrayPtr[item]; } |