diff options
| author | Paul Gilbert | 2015-05-25 08:21:57 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-25 08:21:57 -0400 |
| commit | bcb8c02ba178b79b8352bb58f38f429f7f39928c (patch) | |
| tree | 0efcf7dd6bb9b8b664962c250e4be48220b76672 /engines/sherlock/objects.cpp | |
| parent | 40afa013696a5cebd88c3fd566175ca001d6f310 (diff) | |
| download | scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.tar.gz scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.tar.bz2 scummvm-rg350-bcb8c02ba178b79b8352bb58f38f429f7f39928c.zip | |
SHERLOCK: Free freeing and resetting People list
Diffstat (limited to 'engines/sherlock/objects.cpp')
| -rw-r--r-- | engines/sherlock/objects.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 0709f6b7a9..31a209fea3 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -73,11 +73,16 @@ void Sprite::setImageFrame() { int imageNumber = _walkSequences[_sequenceNumber][frameNum]; if (IS_SERRATED_SCALPEL) - imageNumber = imageNumber + +_walkSequences[_sequenceNumber][0] - 2; + imageNumber = imageNumber + _walkSequences[_sequenceNumber][0] - 2; else if (imageNumber > _numFrames) imageNumber = 1; - _imageFrame = &(_altSequences ? *_altImages : *_images)[imageNumber]; + // Get the images to use + ImageFile *images = _altSequences ? _altImages : _images; + assert(images); + + // Set the frame pointer + _imageFrame = &(*images)[imageNumber]; } void Sprite::adjustSprite() { |