diff options
| -rw-r--r-- | engines/director/score.cpp | 21 | ||||
| -rw-r--r-- | engines/director/score.h | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index da220439ea..6d5247ff98 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -328,6 +328,7 @@ void Score::loadScriptText(Common::SeekableReadStream &stream) { } script += ch; } + if (script != "") _lingo->addCode(script, kMovieScript, _movieScriptCount); @@ -888,8 +889,8 @@ void Frame::readSprite(Common::SeekableReadStream &stream, uint16 offset, uint16 } void Frame::prepareFrame(Score *score) { - renderSprites(*score->_movieArchive, *score->_surface, score->_movieRect, false); - renderSprites(*score->_movieArchive, *score->_trailSurface, score->_movieRect, true); + renderSprites(*score->_surface, false); + renderSprites(*score->_trailSurface, true); if (_transType != 0) //TODO Handle changing area case @@ -1051,20 +1052,26 @@ void Frame::playTransition(Score *score) { } } -void Frame::renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Common::Rect movieRect, bool renderTrail) { +void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) { for (uint16 i = 0; i < CHANNEL_COUNT; i++) { if (_sprites[i]->_enabled) { if ((_sprites[i]->_trails == 0 && renderTrail) || (_sprites[i]->_trails == 1 && !renderTrail)) continue; + Cast *cast = _vm->_currentScore->_casts[_sprites[i]->_castId]; + if (cast->type == kCastText) { + renderText(surface, i); + continue; + } + DIBDecoder img; uint32 imgId = 1024 + _sprites[i]->_castId; - if (!_movie.hasResource(MKTAG('D', 'I', 'B', ' '), imgId)) { + if (!_vm->_currentScore->getArchive()->hasResource(MKTAG('D', 'I', 'B', ' '), imgId)) { continue; } - img.loadStream(*_movie.getResource(MKTAG('D', 'I', 'B', ' '), imgId)); + img.loadStream(*_vm->_currentScore->getArchive()->getResource(MKTAG('D', 'I', 'B', ' '), imgId)); uint32 regX = static_cast<BitmapCast *>(_sprites[i]->_cast)->regX; uint32 regY = static_cast<BitmapCast *>(_sprites[i]->_cast)->regY; @@ -1104,6 +1111,10 @@ void Frame::renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Co } } +void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteID) { + warning("STUB: renderText()"); +} + void Frame::drawBackgndTransSprite(Graphics::ManagedSurface &target, const Graphics::Surface &sprite, Common::Rect &drawRect) { uint8 skipColor = _vm->getPaletteColorCount() - 1; //FIXME is it always white (last entry in pallette) ? diff --git a/engines/director/score.h b/engines/director/score.h index a876a663ee..f276ff5cc1 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -297,7 +297,8 @@ public: private: void playTransition(Score *score); void playSoundChannel(); - void renderSprites(Archive &_movie, Graphics::ManagedSurface &surface, Common::Rect movieRect, bool renderTrail); + void renderSprites(Graphics::ManagedSurface &surface, bool renderTrail); + void renderText(Graphics::ManagedSurface &surface, uint16 spriteID); void readPaletteInfo(Common::SeekableReadStream &stream); void readSprite(Common::SeekableReadStream &stream, uint16 offset, uint16 size); void readMainChannels(Common::SeekableReadStream &stream, uint16 offset, uint16 size); @@ -336,6 +337,7 @@ public: void setStartToLabel(Common::String label); void startLoop(); void processEvents(); + Archive *getArchive() const { return _movieArchive; }; Common::String getMacName() const { return _macName; } private: |