[Scummvm-git-logs] scummvm master -> 1769ef268e4352570ae314cad59190f09a89c127

[sev-]

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:
1769ef268e DIRECTOR: Use directory for external sound casts. Fixes #13307


Commit: 1769ef268e4352570ae314cad59190f09a89c127
    https://github.com/scummvm/scummvm/commit/1769ef268e4352570ae314cad59190f09a89c127
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-03-21T23:08:35+01:00

Commit Message:
DIRECTOR: Use directory for external sound casts. Fixes #13307

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index e8098911fea..201f6a6c932 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -682,7 +682,12 @@ void Cast::loadSoundCasts() {
 		if (sndData != nullptr) {
 			if (sndData->size() == 0) {
 				// audio file is linked, load from the filesystem
-				AudioFileDecoder *audio = new AudioFileDecoder(_castsInfo[c->_key]->fileName);
+				Common::String filename = _castsInfo[c->_key]->fileName;
+
+				if (!_castsInfo[c->_key]->directory.empty())
+					filename = _castsInfo[c->_key]->directory + g_director->_dirSeparator + _castsInfo[c->_key]->fileName;
+
+				AudioFileDecoder *audio = new AudioFileDecoder(filename);
 				soundCast->_audio = audio;
 			} else {
 				SNDDecoder *audio = new SNDDecoder();