[Scummvm-git-logs] scummvm master -> 6b2ed3c8ca9839e81bc7ccf9238e50ec759b20a7

[npjg]

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

Summary:
87a59c6064 DIRECTOR: Add detection for Mercer Mayer storybook
8badd763f2 DIRECTOR: Check .Dir extension on Mac
d1f63e2b1a DIRECTOR: Only convert filename for MMM movies
6b2ed3c8ca GRAPHICS: MACGUI: Properly reset cursor visibility


Commit: 87a59c6064e61c1ff18ec13486b3cf5468c4a3a3
    https://github.com/scummvm/scummvm/commit/87a59c6064e61c1ff18ec13486b3cf5468c4a3a3
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-04T18:33:09-04:00

Commit Message:
DIRECTOR: Add detection for Mercer Mayer storybook

Changed paths:
    engines/director/detection.cpp
    engines/director/detection_tables.h


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index dcb3bdcaf2..9f238bda8f 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -149,6 +149,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "jewels",				"Jewels of the Oracle" },
 	{ "jman",				"The Journeyman Project" },
 	{ "jman2",				"The Journeyman Project 2: Buried in Time" },
+	{ "jmmd",       "Just Me & My Dad" },
 	{ "karma",				"Karma: Curse of the 12 Caves" },
 	{ "kyoto",				"Cosmology of Kyoto" },
 	{ "lion",				"Lion" },
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 8ec1bfe58a..23026e1468 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -151,6 +151,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME_l("jman", "", "JOURNEY.EXE", "65d06b5fef155a2473434571aff5bc29", -1, Common::JA_JPN, 3),
 	WINDEMO("jman", "Demo", "JMDEMO.EXE", "7c8230a804abf9353b05627a675b5ffb", 375305, 3),
 
+	MACGAME("jmmd", "", "Just Me & My Dad", "ea646eccc9a53f44ce082459d4809a06", 486966, 4),
+
 	MACGAME("kyoto", "v1.01", "Cosmology of KYOTO", "f5277c53bacd27936158dd3867e587e2", 392505, 3),
 
 	MACGAME("lzone", "", "L-ZONE", "f5277c53bacd27936158dd3867e587e2", 392484, 3),


Commit: 8badd763f273a67376dde2cb9072a6d34a966644
    https://github.com/scummvm/scummvm/commit/8badd763f273a67376dde2cb9072a6d34a966644
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-04T18:33:09-04:00

Commit Message:
DIRECTOR: Check .Dir extension on Mac

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 28835edb90..3d61e72596 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -408,6 +408,12 @@ Common::String pathMakeRelative(Common::String path, bool recursive, bool addext
 				if (testPath(res))
 					return res;
 			}
+		} else if (g_director->getPlatform() == Common::kPlatformMacintosh && addexts) {
+			// Try adding an extension D4 Mac movies
+			Common::String res = pathMakeRelative(convPath + ".Dir", false, false);
+
+			if (testPath(res))
+				return res;
 		}
 
 		return initialPath;	// Anyway nothing good is happening


Commit: d1f63e2b1a3d3fa0a20dd3fa4b7b59d611267913
    https://github.com/scummvm/scummvm/commit/d1f63e2b1a3d3fa0a20dd3fa4b7b59d611267913
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-04T18:33:09-04:00

Commit Message:
DIRECTOR: Only convert filename for MMM movies

Changed paths:
    engines/director/util.cpp


diff --git a/engines/director/util.cpp b/engines/director/util.cpp
index 3d61e72596..9985cfb89c 100644
--- a/engines/director/util.cpp
+++ b/engines/director/util.cpp
@@ -394,14 +394,12 @@ Common::String pathMakeRelative(Common::String path, bool recursive, bool addext
 				ptr++;
 			}
 
-			Common::String convname = convertMacFilename(component.c_str());
-			debug(2, "pathMakeRelative(): s6 %s -> %s%s", initialPath.c_str(), convPath.c_str(), convname.c_str());
-
 			const char *exts[] = { ".MMM", ".DIR", ".DXR", 0 };
 			for (int i = 0; exts[i] && addexts; ++i) {
-				Common::String newpath = convPath + convname + exts[i];
+				Common::String newpath = convPath +
+					(strcmp(exts[i], ".MMM") == 0 ?  convertMacFilename(component.c_str()) : component.c_str()) + exts[i];
 
-				debug(2, "pathMakeRelative(): s6 try %s", newpath.c_str());
+				debug(2, "pathMakeRelative(): s6 %s -> try %s", initialPath.c_str(), newpath.c_str());
 
 				Common::String res = pathMakeRelative(newpath, false, false);
 


Commit: 6b2ed3c8ca9839e81bc7ccf9238e50ec759b20a7
    https://github.com/scummvm/scummvm/commit/6b2ed3c8ca9839e81bc7ccf9238e50ec759b20a7
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-04T18:33:09-04:00

Commit Message:
GRAPHICS: MACGUI: Properly reset cursor visibility

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 29baec33ef..daea2fa2d6 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -657,6 +657,9 @@ void MacWindowManager::pushWatchCursor() {
 }
 
 void MacWindowManager::pushCursor(MacCursorType type, Cursor *cursor) {
+	if (_cursorType == kMacCursorOff && type != _cursorType)
+		CursorMan.showMouse(true);
+
 	switch (type) {
 	case kMacCursorOff:
 		CursorMan.showMouse(false);
@@ -689,6 +692,9 @@ void MacWindowManager::pushCursor(MacCursorType type, Cursor *cursor) {
 }
 
 void MacWindowManager::replaceCursor(MacCursorType type, Cursor *cursor) {
+	if (_cursorType == kMacCursorOff && type != _cursorType)
+		CursorMan.showMouse(true);
+
 	switch (type) {
 	case kMacCursorOff:
 		CursorMan.showMouse(false);