aboutsummaryrefslogtreecommitdiff
path: root/engines/composer
diff options
context:
space:
mode:
authorAlyssa Milburn2011-07-18 15:07:19 +0200
committerAlyssa Milburn2011-07-18 15:07:19 +0200
commit1c03c7d07dd78c669658d14fd42c9d8a520990bf (patch)
tree4b0946fb3907e0991748e55f3a8c330b0aeb5566 /engines/composer
parentd176fb1a37819b560d5aa44cd3625b4dd37e1ff7 (diff)
downloadscummvm-rg350-1c03c7d07dd78c669658d14fd42c9d8a520990bf.tar.gz
scummvm-rg350-1c03c7d07dd78c669658d14fd42c9d8a520990bf.tar.bz2
scummvm-rg350-1c03c7d07dd78c669658d14fd42c9d8a520990bf.zip
COMPOSER: Fixes for getStreamForSprite.
Diffstat (limited to 'engines/composer')
-rw-r--r--engines/composer/composer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 854363d2bd..83f34dbe06 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -1861,14 +1861,14 @@ void ComposerEngine::decompressBitmap(uint16 type, Common::SeekableReadStream *s
}
Common::SeekableReadStream *ComposerEngine::getStreamForSprite(uint16 id) {
- if (hasResource(ID_BMAP, id))
- return getResource(ID_BMAP, id);
for (Common::List<Pipe *>::iterator k = _pipes.begin(); k != _pipes.end(); k++) {
Pipe *pipe = *k;
if (!pipe->hasResource(ID_BMAP, id))
continue;
- return pipe->getResource(ID_BMAP, id, false);
+ return pipe->getResource(ID_BMAP, id, true);
}
+ if (hasResource(ID_BMAP, id))
+ return getResource(ID_BMAP, id);
return NULL;
}