aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2017-03-12 19:57:58 +0100
committerEugene Sandulenko2017-03-12 19:57:58 +0100
commit811edc9d7ed81db43d1fb17ef18f3cf92d3285ee (patch)
tree3016dc880c13223d9e8d41a8540f69217723ec90 /engines
parenta18805ae773e8b02677abe8b3560785b7c7685c7 (diff)
downloadscummvm-rg350-811edc9d7ed81db43d1fb17ef18f3cf92d3285ee.tar.gz
scummvm-rg350-811edc9d7ed81db43d1fb17ef18f3cf92d3285ee.tar.bz2
scummvm-rg350-811edc9d7ed81db43d1fb17ef18f3cf92d3285ee.zip
DIRECTOR: Implement safety check while Shared Cast loading
Diffstat (limited to 'engines')
-rw-r--r--engines/director/score.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 27943e6a68..c92c0d0758 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -211,7 +211,8 @@ void Score::loadSpriteImages(bool isSharedCast) {
if (isSharedCast) {
debugC(4, kDebugImages, "Shared cast BMP: id: %d", imgId);
pic = _vm->getSharedBMP()->getVal(imgId);
- pic->seek(0); // TODO: this actually gets re-read every loop... we need to rewind it!
+ if (pic != NULL)
+ pic->seek(0); // TODO: this actually gets re-read every loop... we need to rewind it!
} else if (_movieArchive->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
pic = _movieArchive->getResource(MKTAG('B', 'I', 'T', 'D'), imgId);
}