aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scene.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-16 22:48:24 -0400
committerPaul Gilbert2015-05-16 22:48:24 -0400
commit46e27b6293c0de767c9713c08e89e63dcf52fcc3 (patch)
tree06453f1a036e673a154521e065a0c2c88f425683 /engines/sherlock/scene.cpp
parent7aa804b5ccd3489c852bbde01362bd2ce91d6cf8 (diff)
downloadscummvm-rg350-46e27b6293c0de767c9713c08e89e63dcf52fcc3.tar.gz
scummvm-rg350-46e27b6293c0de767c9713c08e89e63dcf52fcc3.tar.bz2
scummvm-rg350-46e27b6293c0de767c9713c08e89e63dcf52fcc3.zip
SHERLOCK: Update CAnim loading for Rose Tattoo
Diffstat (limited to 'engines/sherlock/scene.cpp')
-rw-r--r--engines/sherlock/scene.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 034896486e..0ac2eec0ff 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -398,13 +398,14 @@ bool Scene::loadScene(const Common::String &filename) {
// Load in cAnim list
_cAnim.clear();
if (bgHeader._numcAnimations) {
+ int animSize = _vm->getGameID() == GType_SerratedScalpel ? 65 : 47;
Common::SeekableReadStream *canimStream = _lzwMode ?
- Resources::decompressLZ(*rrmStream, 65 * bgHeader._numcAnimations) :
- rrmStream->readStream(65 * bgHeader._numcAnimations);
+ res.decompress(*rrmStream, animSize * bgHeader._numcAnimations) :
+ rrmStream->readStream(animSize * bgHeader._numcAnimations);
_cAnim.resize(bgHeader._numcAnimations);
for (uint idx = 0; idx < _cAnim.size(); ++idx)
- _cAnim[idx].load(*canimStream);
+ _cAnim[idx].load(*canimStream, _vm->getGameID() == GType_RoseTattoo);
delete canimStream;
}