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

[sev-]

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

Summary:
797807f8fe DIRECTOR: Add full name for lifemysteries
bb32797a09 DIRECTOR: Make Lingo::normalizeXLibName pre-convert path
a5a7ebe7f7 DIRECTOR: Add alias to Misc_X


Commit: 797807f8fe23abaf5a113950da35b710ff412003
    https://github.com/scummvm/scummvm/commit/797807f8fe23abaf5a113950da35b710ff412003
Author: Scott Percival (code at moral.net.au)
Date: 2023-06-14T18:39:41+02:00

Commit Message:
DIRECTOR: Add full name for lifemysteries

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 3c2683f7170..367fc65aeda 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -568,7 +568,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "learnworks2",		"Video Professor: Learn Works for Windows 95, Level 2" },
 	{ "leonardo",			"Leonardo the Inventor" },
 	{ "lewisclark",			"Lewis & Clark Interactive Picture CD" },
-	{ "lifemysteries",		"Life's Greatest Mysteries" },
+	{ "lifemysteries",		"Bob Winkle Solves Life's Greatest Mysteries" },
 	{ "lifeuniverse",		"Life in the Universe" },
 	{ "louvre",				"Le Louvre: The palace & its paintings" },
 	{ "lovedisk",			"Lovedisk 95" },
@@ -5009,7 +5009,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1_l("pippi", "v1.3.3", "Pippi Start", "5f48d38b0c9b9c8790796d1eb1525713", 517216, Common::EN_ANY, 404),
 	WINGAME1t_l("pippi", "v1.3.3", "PIPPI.EXE", "2f3533b95406015d03d5dcd8ba7d961f", 691043, Common::EN_ANY, 404),
 
-	MACGAME1("planetarizona", "", "Planet Arizona", "0c7bbb4b24823e5ab871cb4c1d6f3710", 488433, 400),
+	MACGAME1("planetarizona", "", "Manual Installation/Planet Arizona", "0c7bbb4b24823e5ab871cb4c1d6f3710", 488433, 400),
 	WINGAME1("planetarizona", "", "ARIZONA.EXE", "a23462ec87eff973d2cdb2ddfd4a59fa", 698651, 400),
 
 	// Mac demo from MacFormat #44


Commit: bb32797a09fc5ad10315470d02e768f8dc8b2acc
    https://github.com/scummvm/scummvm/commit/bb32797a09fc5ad10315470d02e768f8dc8b2acc
Author: Scott Percival (code at moral.net.au)
Date: 2023-06-14T18:39:41+02:00

Commit Message:
DIRECTOR: Make Lingo::normalizeXLibName pre-convert path

Fixes openXLib path handling in Total Distortion.

Changed paths:
    engines/director/lingo/lingo-object.cpp


diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index cbc4cd49aab..52184dc277d 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -237,26 +237,24 @@ void Lingo::cleanupXLibs() {
 }
 
 Common::String Lingo::normalizeXLibName(Common::String name) {
+	// Normalize to remove machintosh path delimiters (':', '@:')
+	name = convertPath(name);
+
+	size_t pos = name.findLastOf(g_director->_dirSeparator);
+	if (pos != Common::String::npos)
+		name = name.substr(pos + 1, name.size());
+
 	Common::Platform platform = _vm->getPlatform();
 	if (platform == Common::kPlatformMacintosh || platform == Common::kPlatformMacintoshII) {
-		size_t pos = name.findLastOf(':');
-		if (pos != Common::String::npos)
-			name = name.substr(pos + 1, name.size());
 		if (name.hasSuffixIgnoreCase(".xlib"))
 			name = name.substr(0, name.size() - 5);
 	} else if (platform == Common::kPlatformWindows) {
-		size_t pos = name.findLastOf("\\");
-		if (pos != Common::String::npos)
-			name = name.substr(pos + 1, name.size());
 		if (name.hasSuffixIgnoreCase(".dll"))
 			name = name.substr(0, name.size() - 4);
 	}
 
 	name.trim();
 
-	// Normalize to remove machintosh path delimiters (':', '@:')
-	name = convertPath(name);
-
 	return name;
 }
 


Commit: a5a7ebe7f7cc338ffe493ae4418eb9760b33de8e
    https://github.com/scummvm/scummvm/commit/a5a7ebe7f7cc338ffe493ae4418eb9760b33de8e
Author: Scott Percival (code at moral.net.au)
Date: 2023-06-14T18:39:41+02:00

Commit Message:
DIRECTOR: Add alias to Misc_X

Changed paths:
    engines/director/lingo/xlibs/miscx.cpp


diff --git a/engines/director/lingo/xlibs/miscx.cpp b/engines/director/lingo/xlibs/miscx.cpp
index 2c6f1fc0ade..b2d5a7e23f9 100644
--- a/engines/director/lingo/xlibs/miscx.cpp
+++ b/engines/director/lingo/xlibs/miscx.cpp
@@ -72,6 +72,7 @@ namespace Director {
 const char *MiscX::xlibName = "Misc_X";
 const char *MiscX::fileNames[] = {
 	"MISC_X",
+	"sharCOPY", // TD loads this up using openXLib("@:sharCOPY.DLL")
 	0
 };