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

[rvanlaar]

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:
cc332e0a08 DIRECTOR: Load QuickTime movies based on path


Commit: cc332e0a08fa51ad747a2a9f382ddc352cded8ee
    https://github.com/scummvm/scummvm/commit/cc332e0a08fa51ad747a2a9f382ddc352cded8ee
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-08-01T21:35:19+02:00

Commit Message:
DIRECTOR: Load QuickTime movies based on path

DigitalVideoCasts have a directory and filename in their
castInfo. Use both, in combination with pathMakeRelative
to get the correct file.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index a6f3ca2c62..7f9f6facf9 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -628,7 +628,9 @@ void Cast::loadDigitalVideoCasts() {
 			// TODO: detect file type (AVI, QuickTime, FLIC) based on magic number,
 			// insert the right video decoder
 			digitalVideoCast->_video = new Video::QuickTimeDecoder();
-			if (!digitalVideoCast->_video->loadFile(_castsInfo[c->_key]->fileName)) {
+			Common::String filename = _castsInfo[c->_key]->fileName;
+			Common::String directory = _castsInfo[c->_key]->directory;
+			if (!digitalVideoCast->_video->loadFile(pathMakeRelative(directory + "\\" + filename)) {
 				warning("Cast::loadDigitalVideoCasts: failed to load QuickTime file for cast member %d", videoId);
 			}
 		} else {