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

[sluicebox]

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

Summary:
6a9ad2daf2 SCI32: Update hi-res detection for PQ4 Mac


Commit: 6a9ad2daf216fe23782170c348ffd1e5bf49ddee
    https://github.com/scummvm/scummvm/commit/6a9ad2daf216fe23782170c348ffd1e5bf49ddee
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-09-07T17:02:01-07:00

Commit Message:
SCI32: Update hi-res detection for PQ4 Mac

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/graphics/frameout.cpp


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 38c22ba537..4531688126 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -3977,7 +3977,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"Data5", 0, "e766923060f7b85f1cd8909240412796", 5194686},
 		{"Data6", 0, "ca95355f5f89dcf45e78c073ef83471b", 6599265},
 		AD_LISTEND},
-		Common::EN_ANY, Common::kPlatformMacintosh, ADGF_CD | ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_PQ4_MAC },
+		Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO_PQ4_MAC },
 
 #undef GUIO_PQ4_FLOPPY
 #undef GUIO_PQ4_CD
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 5bcf4702bc..0402ffa496 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -140,7 +140,9 @@ bool GfxFrameout::detectHiRes() const {
 	}
 
 	// PQ4 DOS floppy is low resolution only
-	if (g_sci->getGameId() == GID_PQ4 && !g_sci->isCD()) {
+	if (g_sci->getGameId() == GID_PQ4 &&
+		g_sci->getPlatform() == Common::kPlatformDOS &&
+		!g_sci->isCD()) {
 		return false;
 	}