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

[sluicebox]

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:
0d37562e69 SCI32: Set correct PQ4 Mac detection flags
a455e23c5f SCI32: Use CursorManager to show/hide Mac cursors


Commit: 0d37562e69b719e65b817a471275550375ee4e55
    https://github.com/scummvm/scummvm/commit/0d37562e69b719e65b817a471275550375ee4e55
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-09-07T07:39:10-07:00

Commit Message:
SCI32: Set correct PQ4 Mac detection flags

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 466b1aed74..38c22ba537 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -3918,8 +3918,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 #define GUIO_PQ4_CD     GUIO3(GUIO_LINKSPEECHTOSFX, \
                               GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, \
                               GAMEOPTION_ORIGINAL_SAVELOAD)
-#define GUIO_PQ4_MAC    GUIO2(GUIO_LINKSPEECHTOSFX, \
-                              GAMEOPTION_HIGH_RESOLUTION_GRAPHICS)
+#define GUIO_PQ4_MAC    GUIO1(GUIO_LINKSPEECHTOSFX)
 
 	// Police Quest 4 - English DOS CD (from the Police Quest Collection)
 	// Executable scanning reports "2.100.002", VERSION file reports "1.100.000"
@@ -3978,7 +3977,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"Data5", 0, "e766923060f7b85f1cd8909240412796", 5194686},
 		{"Data6", 0, "ca95355f5f89dcf45e78c073ef83471b", 6599265},
 		AD_LISTEND},
-		Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_PQ4_MAC },
+		Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD | ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_PQ4_MAC },
 
 #undef GUIO_PQ4_FLOPPY
 #undef GUIO_PQ4_CD


Commit: a455e23c5fca1e38ec7647ade99c4540fd9c9ba1
    https://github.com/scummvm/scummvm/commit/a455e23c5fca1e38ec7647ade99c4540fd9c9ba1
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-09-07T07:39:10-07:00

Commit Message:
SCI32: Use CursorManager to show/hide Mac cursors

Fixes cursor disappearing after closing overlay dialog

Changed paths:
    engines/sci/graphics/maccursor32.cpp


diff --git a/engines/sci/graphics/maccursor32.cpp b/engines/sci/graphics/maccursor32.cpp
index 8484db5843..0d7920dcd6 100644
--- a/engines/sci/graphics/maccursor32.cpp
+++ b/engines/sci/graphics/maccursor32.cpp
@@ -81,7 +81,7 @@ void GfxMacCursor32::hide() {
 		return;
 	}
 
-	g_system->showMouse(false);
+	CursorMan.showMouse(false);
 }
 
 void GfxMacCursor32::unhide() {
@@ -89,12 +89,12 @@ void GfxMacCursor32::unhide() {
 		return;
 	}
 
-	g_system->showMouse(true);
+	CursorMan.showMouse(true);
 }
 
 void GfxMacCursor32::show() {
 	if (_hideCount) {
-		g_system->showMouse(true);
+		CursorMan.showMouse(true);
 		_hideCount = 0;
 	}
 }