[Scummvm-git-logs] scummvm master -> d765bb334d3cf26cc77ae8825718c39eb5792126

stevenhoefel stevenhoefel at hotmail.com
Mon Jan 16 03:19:56 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d765bb334d DIRECTOR: Rewind shared cast memorystream before trying to load the data.


Commit: d765bb334d3cf26cc77ae8825718c39eb5792126
    https://github.com/scummvm/scummvm/commit/d765bb334d3cf26cc77ae8825718c39eb5792126
Author: stevenhoefel (stevenhoefel at hotmail.com)
Date: 2017-01-16T13:19:47+11:00

Commit Message:
DIRECTOR: Rewind shared cast memorystream before trying to load the data.

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index c58ae7d..bbaa61d 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -722,6 +722,7 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) {
 	if (_vm->getSharedBMP() != NULL && _vm->getSharedBMP()->contains(imgId)) {
 		debugC(2, kDebugImages, "Shared cast BMP: id: %d", imgId);
 		pic = _vm->getSharedBMP()->getVal(imgId);
+		pic->seek(0); //TODO: this actually gets re-read every loop... we need to rewind it!
 		bc = static_cast<BitmapCast *>(_vm->getSharedCasts()->getVal(spriteId));
 	} else 	if (_vm->_currentScore->getArchive()->hasResource(MKTAG('B', 'I', 'T', 'D'), imgId)) {
 		pic = _vm->_currentScore->getArchive()->getResource(MKTAG('B', 'I', 'T', 'D'), imgId);





More information about the Scummvm-git-logs mailing list