[Scummvm-git-logs] scummvm master -> 1750ecfab6dac736805ba0a3729fa916f7b8f9ee

[djsrv]

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:
1750ecfab6 DIRECTOR: decode movie paths before loading


Commit: 1750ecfab6dac736805ba0a3729fa916f7b8f9ee
    https://github.com/scummvm/scummvm/commit/1750ecfab6dac736805ba0a3729fa916f7b8f9ee
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-11-08T23:42:45-05:00

Commit Message:
DIRECTOR: decode movie paths before loading

Changed paths:
    engines/director/resource.cpp
    engines/director/util.cpp
    engines/director/util.h


diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index e963560b44..2ae2937096 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -153,7 +153,7 @@ void Window::probeMacBinary(MacArchive *archive) {
 			if (num == 0)
 				error("No strings in Projector file");
 
-			Common::String sname = name->readPascalString();
+			Common::String sname = decodePlatformEncoding(name->readPascalString());
 			Common::String moviePath = pathMakeRelative(sname);
 			if (testPath(moviePath)) {
 				_nextMovie.movie = moviePath;
diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 1960f05a78..5befff8902 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -983,4 +983,8 @@ Common::String castTypeToString(const CastType &type) {
 	return res;
 }
 
+Common::String decodePlatformEncoding(Common::String input) {
+	return input.decode(g_director->getPlatformEncoding());
+}
+
 } // End of namespace Director
diff --git a/engines/director/util.h b/engines/director/util.h
index b2d7bd3af4..bf2b994e37 100644
--- a/engines/director/util.h
+++ b/engines/director/util.h
@@ -97,6 +97,8 @@ Common::String encodePathForDump(const Common::String &path);
 
 Common::String utf8ToPrintable(const Common::String &str);
 
+Common::String decodePlatformEncoding(Common::String input);
+
 } // End of namespace Director
 
 #endif