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

[rvanlaar]

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

Summary:
3a77a95a6a DIRECTOR: fall back to AVI decoder
b8aa4aedba JANITORAL: spelling fix


Commit: 3a77a95a6a5bd48556b66926a6ca8d52c141207f
    https://github.com/scummvm/scummvm/commit/3a77a95a6a5bd48556b66926a6ca8d52c141207f
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-11T00:02:04+01:00

Commit Message:
DIRECTOR: fall back to AVI decoder

AVI video is used in the mckenzie-demo-win game.

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index a0e466bccdf..199943e7977 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -21,6 +21,7 @@
 
 #include "graphics/macgui/macbutton.h"
 #include "image/image_decoder.h"
+#include "video/avi_decoder.h"
 #include "video/qt_decoder.h"
 
 #include "director/director.h"
@@ -360,6 +361,10 @@ bool DigitalVideoCastMember::loadVideo(Common::String path) {
 
 	debugC(2, kDebugLoading | kDebugImages, "Loading video %s", path.c_str());
 	bool result = _video->loadFile(Common::Path(path, g_director->_dirSeparator));
+	if (!result){
+		_video = new Video::AVIDecoder();
+		result = _video->loadFile(Common::Path(path, g_director->_dirSeparator));
+	}
 
 	if (result && g_director->_pixelformat.bytesPerPixel == 1) {
 		// Director supports playing back RGB and paletted video in 256 colour mode.


Commit: b8aa4aedba84b411d3d20a3a2d1584535e3c2697
    https://github.com/scummvm/scummvm/commit/b8aa4aedba84b411d3d20a3a2d1584535e3c2697
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-11T00:02:50+01:00

Commit Message:
JANITORAL: spelling fix

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index a174ceccadf..5b2217ee823 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -446,7 +446,7 @@ Common::String pathMakeRelative(Common::String path, bool recursive, bool addext
 	if (searchPath.type == ARRAY && searchPath.u.farr->arr.size() > 0) {
 		for (uint i = 0; i < searchPath.u.farr->arr.size(); i++) {
 			Common::String searchIn = searchPath.u.farr->arr[i].asString();
-			debug(9, "athMakeRelative(): searchPath: %s", searchIn.c_str());
+			debug(9, "pathMakeRelative(): searchPath: %s", searchIn.c_str());
 
 			foundPath = wrappedPathMakeRelative(searchIn + path, recursive, addexts, directory);
 			if (testPath(foundPath))