diff options
| author | Eugene Sandulenko | 2016-11-13 01:14:49 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-11-13 01:15:12 +0100 |
| commit | 82211302c04f8320953d568b912052e3c6d3f11c (patch) | |
| tree | ba76b5e7c7a98f70028b0edf811ef967c8d7da41 /engines/director/frame.cpp | |
| parent | 476513389297786021743e16de777e99e0fea709 (diff) | |
| download | scummvm-rg350-82211302c04f8320953d568b912052e3c6d3f11c.tar.gz scummvm-rg350-82211302c04f8320953d568b912052e3c6d3f11c.tar.bz2 scummvm-rg350-82211302c04f8320953d568b912052e3c6d3f11c.zip | |
DIRECTOR: More work on Cast loading in D4
Diffstat (limited to 'engines/director/frame.cpp')
| -rw-r--r-- | engines/director/frame.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index 6464943d99..cccfb375c8 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -559,6 +559,8 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) { continue; } + assert(_sprites[i]->_cast); + uint32 regX = static_cast<BitmapCast *>(_sprites[i]->_cast)->regX; uint32 regY = static_cast<BitmapCast *>(_sprites[i]->_cast)->regY; uint32 rectLeft = static_cast<BitmapCast *>(_sprites[i]->_cast)->initialRect.left; @@ -646,9 +648,10 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) { } if (_vm->_currentScore->getArchive()->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) { + warning("************"); Common::SeekableReadStream *pic = _vm->_currentScore->getArchive()->getResource(MKTAG('B', 'I', 'T', 'D'), imgId); - if (_vm->getVersion() < 4) { + if (_vm->getVersion() <= 4) { BitmapCast *bc = static_cast<BitmapCast *>(_vm->_currentScore->_casts[spriteId]); int w = bc->initialRect.width(), h = bc->initialRect.height(); |