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

[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:
b96174c02e DIRECTOR: testExtensions: Try the non-converted filename as well


Commit: b96174c02e414fa6e671b7206780caed40905b17
    https://github.com/scummvm/scummvm/commit/b96174c02e414fa6e671b7206780caed40905b17
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-10-17T12:47:04+02:00

Commit Message:
DIRECTOR: testExtensions: Try the non-converted filename as well

Required to get Wrath of the Gods to play, because due the existing code, when given `30AM1`, it was only checking `30AM1` and `AM1.MMM` but not `30AM1.MMM` (which is what the file is called)

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 8d9fabea1fc..794e0a2e300 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -646,6 +646,15 @@ Common::String testExtensions(Common::String component, Common::String initialPa
 	const char *extsD4[] = { ".DIR", ".DXR", nullptr };
 
 	const char **exts = (g_director->getVersion() >= 400) ? extsD4 : extsD3;
+	for (int i = 0; exts[i]; ++i) {
+		Common::String newpath = convPath + component.c_str() + exts[i];
+
+		debug(9, "testExtensions(): sT %s -> try %s, comp: %s", initialPath.c_str(), newpath.c_str(), component.c_str());
+		Common::String res = wrappedPathMakeRelative(newpath, false, false);
+
+		if (testPath(res))
+			return res;
+	}
 	for (int i = 0; exts[i]; ++i) {
 		Common::String newpath = convPath + convertMacFilename(component.c_str()) + exts[i];