[Scummvm-git-logs] scummvm master -> 7eb19ad3bc2d4ad5b4b68fb4c6ecbf56c97a6db3

[mistydemeo]

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:
111ebfd2a0 DIRECTOR: add willywabbitmath
7eb19ad3bc DIRECTOR: fix misc xlib finding movies


Commit: 111ebfd2a0e541267c453d4bf1edebd0286e851a
    https://github.com/scummvm/scummvm/commit/111ebfd2a0e541267c453d4bf1edebd0286e851a
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-08-24T20:47:42-07:00

Commit Message:
DIRECTOR: add willywabbitmath

Changed paths:
    engines/director/detection_tables.h
    engines/director/lingo/xlibs/misc.cpp


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index a27fdcbf643..c770c141bb0 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -469,6 +469,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "wiggles1",			"A Day with the Wiggles" },
 	{ "willywabbit",		"Willy Wabbit & His Magical Books" },
 	{ "willywabbit2",		"Around the World With Willy Wabbit" },
+	{ "willywabbitmath",	"Willy Wabbit Math Adventure" },
 	{ "willywabbitmosaic",	"Mosaic Game" },
 	{ "winniewitch",		"Winnie the Witch" },
 	{ "wishbone", 			"Wishbone and the Amazing Odyssey" },
@@ -6863,6 +6864,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME1("vp2", "", "VPHYS2.EXE", "c3c38bd3907ca7e13220b74bd0317a6c", 1021347, 500),
 	WINDEMO1("vp2", "Demo", "VP2DEMO.EXE", "c3c38bd3907ca7e13220b74bd0317a6c", 1021353, 500),
 
+	WINGAME1t("willywabbitmath", "US Version", "MATHAD32.EXE", "b8417f75139827f36d96c0c8cc0189d4", 2038701, 501),
+
 	MACGAME1("wine", "", "double-click me!", "231d3041df162be4a0ddd36a74eb03b6", 719289, 501),
 	WINGAME2("wine", "", "WIN95.EXE",		 "1a7acbba10a7246ba58c1d53fc7203f5", 1411337,
 						 "160MAIN.DXR",		 "23dbb4744121b077d331b01123709519", 592640, 501),
diff --git a/engines/director/lingo/xlibs/misc.cpp b/engines/director/lingo/xlibs/misc.cpp
index 6f97eb3e0b6..2204dbefb49 100644
--- a/engines/director/lingo/xlibs/misc.cpp
+++ b/engines/director/lingo/xlibs/misc.cpp
@@ -23,6 +23,7 @@
  *
  * USED IN:
  * Around the World With Willy Wabbit
+ * Willy Wabbit Math Adventure
  *
  *************************************/
 


Commit: 7eb19ad3bc2d4ad5b4b68fb4c6ecbf56c97a6db3
    https://github.com/scummvm/scummvm/commit/7eb19ad3bc2d4ad5b4b68fb4c6ecbf56c97a6db3
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-08-24T20:47:42-07:00

Commit Message:
DIRECTOR: fix misc xlib finding movies

The only examples of this being used are for looking up movies.
findMoviePath will handle a file extension mismatch, which happens in
a D5 game that specifies a .DIR filename when the file on disc is .DXR.

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


diff --git a/engines/director/lingo/xlibs/misc.cpp b/engines/director/lingo/xlibs/misc.cpp
index 2204dbefb49..84c2ce976b7 100644
--- a/engines/director/lingo/xlibs/misc.cpp
+++ b/engines/director/lingo/xlibs/misc.cpp
@@ -88,7 +88,7 @@ void Misc::m_getProfileString(int nargs) {
 
 void Misc::m_isFilePresent(int nargs) {
     Common::String filename = g_lingo->pop().asString();
-    Common::Path filePath = findPath(filename);
+    Common::Path filePath = findMoviePath(filename);
     if (filePath.empty()) {
         g_lingo->push(Datum(0));
     } else {