DIRECTOR: decode movie paths before loading

scummvm · Nov 9, 2021 · 7c6df35 · 7c6df35
1 parent dc5992a
commit 7c6df35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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