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

[bluegr]

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:
1721d61126 DIRECTOR: Add full game detection for fpgapirates
ac06583b5a DIRECTOR: movutils fixes for fpgapirates


Commit: 1721d61126f3314b9b0aa96eae8e7ff9285ae5b6
    https://github.com/scummvm/scummvm/commit/1721d61126f3314b9b0aa96eae8e7ff9285ae5b6
Author: eientei95 (einstein95 at users.noreply.github.com)
Date: 2025-01-04T09:40:01+02:00

Commit Message:
DIRECTOR: Add full game detection for fpgapirates

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index a082175525e..64d87e66616 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -171,7 +171,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "fpbagarage",			"Fisher-Price Big Action Garage" },
 	{ "fpdollhouse",		"Fisher-Price Time to Play: Grand Dollhouse" },
 	{ "fpgacastle2",		"Great Adventures by Fisher-Price: Castle (1998)" },
-	{ "fpgapirates",		"Great Adventures by Fisher-Price: Pirates" },
+	{ "fpgapirates",		"Great Adventures by Fisher-Price: Pirate Ship" },	// Demo says "Pirates"
 	{ "fpgawestern",		"Great Adventures by Fisher-Price: Wild Western Town" },
 	{ "fplit",				"Fisher-Price Learning in Toyland" },
 	{ "fplpairport",		"Fisher-Price Little People: Discovery Airport" },
@@ -4193,6 +4193,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 								"YP1.DIR",   "86dca2337cbbd2612fc92bd5d0805d85", 4509574, 404),
 
 	// ©1996 Davidson & Associates, Inc.
+	// Full game is Director 5
 	MACDEMO1("fpgapirates", "Preview v1.0", "Pirates Preview (Power Mac)", "ccf864a8dc6e9d0d26eb73b4683e634b", 63276, 404),
 	WINDEMO1("fpgapirates", "Preview v1.0", "FPPSTART.EXE", "t:824388aeb958eda1a5691a1d6667a410", 792405, 404),
 
@@ -6701,6 +6702,12 @@ static const DirectorGameDescription gameDescriptions[] = {
 						  "FILES/BLOCKS.DIR",	  "d:74388b29ce10d83bbad48c664d87eab3", 7363670, 500),
 	MACDEMO1("fplit", "Demo", "Toyland Preview", "9fbd2e99a6a23933083ba0934e4a7d01", 705417, 500),
 
+	WINGAME1("fpgapirates", "1996", "PIR32BIT/START32.EXE", "t:564db7e9ffacb6c0fecbf83c1f988069", 1394437, 500),
+	// Same EXE, different location
+	WINGAME2("fpgapirates", "1999", "INSTALL/EXE/START32.EXE", "t:564db7e9ffacb6c0fecbf83c1f988069", 1394437,
+									"PIRFILES/open.Dir", "t:0c0b3490b9fba141bf0fad8a735f145a", 1142930, 500),
+	MACGAME1("fpgapirates", "1999", "Fisher-Price Pirate Ship", "r:9fbd2e99a6a23933083ba0934e4a7d01", 705417, 500),
+
 	WINDEMO1t("fpready", "Demo", "FPRFS32.EXE", "b976d39fa7f7cf18a05149b5593f43e0", 2901579, 501),
 
 	// ©1996 Davidson & Associates, Inc.


Commit: ac06583b5aaf9edfe45439fe71192fb19a117833
    https://github.com/scummvm/scummvm/commit/ac06583b5aaf9edfe45439fe71192fb19a117833
Author: eientei95 (einstein95 at users.noreply.github.com)
Date: 2025-01-04T09:40:01+02:00

Commit Message:
DIRECTOR: movutils fixes for fpgapirates
* Add MovieUtilities name for Mac version
* Add alternate Windows DLL name (movieutl)

Changed paths:
    engines/director/lingo/xlibs/movutils.cpp
    engines/director/lingo/xlibs/movutils.h


diff --git a/engines/director/lingo/xlibs/movutils.cpp b/engines/director/lingo/xlibs/movutils.cpp
index b354c024559..7b3c87d4c8f 100644
--- a/engines/director/lingo/xlibs/movutils.cpp
+++ b/engines/director/lingo/xlibs/movutils.cpp
@@ -34,6 +34,7 @@
  * Gahan Wilson's Ultimate Haunted House
  * Momi no Ki no Shita de: The Day of St. Claus
  * Virtual Nightclub
+ * Great Adventures by Fisher-Price: Pirate Ship
  *
  **************************************************/
 
@@ -104,9 +105,15 @@ III    mGetMessage           --Get mouse/key messages from the application messa
 
 namespace Director {
 
-const char *const MovUtilsXObj::xlibName = "MovUtils";
+const char *const MovUtilsXObj::xlibNames[] = {
+	"MovUtils",
+	"MovieUtilities",
+	nullptr
+};
 const XlibFileDesc MovUtilsXObj::fileNames[] = {
 	{ "MOVUTILS",	nullptr },
+	{ "MovieUtilities",	nullptr },
+	{ "movieutl", nullptr },
 	{ nullptr,		nullptr },
 };
 
@@ -177,14 +184,17 @@ MovUtilsXObject::MovUtilsXObject(ObjectType ObjectType) :Object<MovUtilsXObject>
 void MovUtilsXObj::open(ObjectType type, const Common::Path &path) {
     MovUtilsXObject::initMethods(xlibMethods);
     MovUtilsXObject *xobj = new MovUtilsXObject(type);
-    g_lingo->exposeXObject(xlibName, xobj);
+	for (uint i = 0; xlibNames[i]; i++) {
+		g_lingo->exposeXObject(xlibNames[i], xobj);
+	}
     g_lingo->initBuiltIns(xlibBuiltins);
 }
 
 void MovUtilsXObj::close(ObjectType type) {
     MovUtilsXObject::cleanupMethods();
-    g_lingo->_globalvars[xlibName] = Datum();
-
+	for (uint i = 0; xlibNames[i]; i++) {
+		g_lingo->_globalvars[xlibNames[i]] = Datum();
+	}
 }
 
 void MovUtilsXObj::m_new(int nargs) {
diff --git a/engines/director/lingo/xlibs/movutils.h b/engines/director/lingo/xlibs/movutils.h
index b01ab7903a8..680338dcd84 100644
--- a/engines/director/lingo/xlibs/movutils.h
+++ b/engines/director/lingo/xlibs/movutils.h
@@ -31,7 +31,7 @@ public:
 
 namespace MovUtilsXObj {
 
-extern const char *const xlibName;
+extern const char *const xlibNames[];
 extern const XlibFileDesc fileNames[];
 
 void open(ObjectType type, const Common::Path &path);