aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2007-11-18 04:34:08 +0000
committerTravis Howell2007-11-18 04:34:08 +0000
commit4ce9b7fa15b28944338be190030649d58b103810 (patch)
tree0e375074c0e4dab1fd2132005764a6b1a88a2a69 /engines
parent70c4f25aef09d7e15d13090909cd6713cd4572e6 (diff)
downloadscummvm-rg350-4ce9b7fa15b28944338be190030649d58b103810.tar.gz
scummvm-rg350-4ce9b7fa15b28944338be190030649d58b103810.tar.bz2
scummvm-rg350-4ce9b7fa15b28944338be190030649d58b103810.zip
Switch invalid items back to error message, since restart state issues are fixed now..
svn-id: r29544
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/items.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 3b0ac1d205..fed323e70e 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -382,13 +382,8 @@ int AGOSEngine::wordMatch(Item *item, int16 a, int16 n) {
}
Item *AGOSEngine::derefItem(uint 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;
- }
-
+ if (item >= _itemArraySize)
+ error("derefItem: invalid item %d", item);
return _itemArrayPtr[item];
}