aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2016-02-21 12:51:31 +0100
committerWillem Jan Palenstijn2016-02-21 12:51:31 +0100
commit3c3b7ec13d0c4fea3b335c989033042544ab39eb (patch)
tree35276f15ceb5db49ae1c05d04638d43be4af8c3d
parent748b7684b275799893f0b39760edbec1a2d38c98 (diff)
downloadscummvm-rg350-3c3b7ec13d0c4fea3b335c989033042544ab39eb.tar.gz
scummvm-rg350-3c3b7ec13d0c4fea3b335c989033042544ab39eb.tar.bz2
scummvm-rg350-3c3b7ec13d0c4fea3b335c989033042544ab39eb.zip
SCI: Skip NULL entries in FindByObject
Lists can contain gaps if they're searched before Pack() is called.
-rw-r--r--engines/sci/graphics/lists32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/lists32.h b/engines/sci/graphics/lists32.h
index f745a2cb6d..bb990e17ca 100644
--- a/engines/sci/graphics/lists32.h
+++ b/engines/sci/graphics/lists32.h
@@ -184,7 +184,7 @@ class FindByObject {
public:
FindByObject(const reg_t &object) : _object(object) {}
bool operator()(const T entry) const {
- return entry->_object == _object;
+ return entry && entry->_object == _object;
}
};