[Scummvm-git-logs] scummvm master -> 9b58b79ad1e503b6e47b6f6dbc305fac3e8f732a

[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:
9b58b79ad1 SCI32: Use modified attenuation for QFG4 CD


Commit: 9b58b79ad1e503b6e47b6f6dbc305fac3e8f732a
    https://github.com/scummvm/scummvm/commit/9b58b79ad1e503b6e47b6f6dbc305fac3e8f732a
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-05-18T09:49:25-07:00

Commit Message:
SCI32: Use modified attenuation for QFG4 CD

Thanks to @tsoliman for discovering this obscure discrepancy.

Confirmed in disassembly. Also confirmed that MOTHERGOOSEHIRES uses
modified attenuation, and discovered that floppy QFG4 and PQ4 do not,
and that one version of SQ6 does and one does not.

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/engine/features.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 60265c0eda3..94a163e842f 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -6068,6 +6068,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 
 	// Space Quest 6 - English DOS/Win3.11 CD (from the Space Quest Collection)
 	// Executable scanning reports "2.100.002", VERSION file reports "1.0"
+	// This is a different interpreter than in version 1.11, though both say "May 24 1995"
 	{"sq6", "", {
 		{"resource.map", 0, "6dddfa3a8f3a3a513ec9dfdfae955005", 10528},
 		{"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806},
@@ -6075,7 +6076,8 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_SQ6 },
 
 	// Space Quest 6 - English DOS/Win3.11 CD ver 1.11 (from FRG)
-	// SCI interpreter version 2.100.002 (just a guess)
+	// Executable scanning reports "2.100.002", VERSION file reports "1.11"
+	// This is a different interpreter than in version 1.0, though both say "May 24 1995"
 	{"sq6", "", {
 		{"resource.map", 0, "e0615d6e4e10e37ae42e6a2a95aaf145", 10528},
 		{"resource.000", 0, "c4259ab7355aead07773397b1052827d", 41150806},
diff --git a/engines/sci/engine/features.h b/engines/sci/engine/features.h
index 4c401acf58d..730117817ce 100644
--- a/engines/sci/engine/features.h
+++ b/engines/sci/engine/features.h
@@ -98,11 +98,14 @@ public:
 
 	inline bool usesModifiedAudioAttenuation() const {
 		switch (g_sci->getGameId()) {
-		// Assuming MGDX uses modified attenuation since SQ6 does and it was
-		// released earlier, but not verified (Phar Lap Windows-only release)
-		case GID_MOTHERGOOSEHIRES:
 		case GID_PQ4:
+		case GID_QFG4:
+			return g_sci->isCD();
+		case GID_MOTHERGOOSEHIRES:
 		case GID_SQ6:
+			// SQ6 1.0 uses modified attenuation, 1.11 does not.
+			// The interpreters are different even though they both have the
+			// same date and version string. ("May 24 1995", "2.100.002")
 			return true;
 		case GID_KQ7:
 			// KQ7 1.51 (SCI2.1early) uses the non-standard attenuation, but