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

[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:
d9aa85a22b SCI: Add detection entry for KQ6 CD 1.000.000
a15615d81c SCI: Update KQ6 script patch for CD 1.000.000


Commit: d9aa85a22b79b58382acc157e288ef425531988d
    https://github.com/scummvm/scummvm/commit/d9aa85a22b79b58382acc157e288ef425531988d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-05T11:19:16-07:00

Commit Message:
SCI: Add detection entry for KQ6 CD 1.000.000

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 09245f6079..6f15d13838 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1901,8 +1901,27 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::IT_ITA, Common::kPlatformDOS, 0, GUIO_STD16	},
 
-	// King's Quest 6 - English DOS CD (from the King's Quest Collection)
-	// Executable scanning reports "1.cfs.158", VERSION file reports "1.034 9/11/94 - KQ6 version 1.000.00G"
+	// King's Quest 6 - English DOS CD (supplied by trembyle)
+	// Executable scanning reports "1.cfs.158", VERSION file reports "1.000.000"
+	// SCI interpreter version 1.001.054
+	{"kq6", "CD", {
+		{"resource.map", 0, "db35b0094083f81bfb0239a7a5410313", 9215},
+		{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376008},
+		{"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 259510},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD, GUIO4(GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
+	// King's Quest 6 - Windows DOS CD (supplied by trembyle)
+	// Executable scanning reports "1.001.069", VERSION file reports "1.000.000"
+	{"kq6", "CD", {
+		{"resource.map", 0, "db35b0094083f81bfb0239a7a5410313", 9215},
+		{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376008},
+		{"resource.msg", 0, "3cf5de44de36191f109d425b8450efc8", 259510},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformWindows, ADGF_CD, GUIO6(GUIO_NOASPECT, GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, GAMEOPTION_KQ6_WINDOWS_CURSORS, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
+	// King's Quest 6 - English DOS CD (same version included in King's Quest Collection)
+	// Executable scanning reports "1.cfs.158", VERSION file reports "1.000.00G"
 	// SCI interpreter version 1.001.054
 	{"kq6", "CD", {
 		{"resource.map", 0, "7a550ebfeae2575ca00d47703a6a774c", 9215},
@@ -1910,9 +1929,8 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_CD, GUIO4(GAMEOPTION_HIGH_RESOLUTION_GRAPHICS, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
-	// King's Quest 6 - English Windows CD (from the King's Quest Collection)
-	// Executable scanning reports "1.cfs.158", VERSION file reports "1.034 9/11/94 - KQ6 version 1.000.00G"
-	// SCI interpreter version 1.001.054
+	// King's Quest 6 - English Windows CD (same version included in King's Quest Collection)
+	// Executable scanning reports "1.001.069", VERSION file reports "1.000.00G"
 	{"kq6", "CD", {
 		{"resource.map", 0, "7a550ebfeae2575ca00d47703a6a774c", 9215},
 		{"resource.000", 0, "233394a5f33b475ae5975e7e9a420865", 8376352},


Commit: a15615d81ca0ecc765be96df9391aa4e7e500e91
    https://github.com/scummvm/scummvm/commit/a15615d81ca0ecc765be96df9391aa4e7e500e91
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-05T11:20:13-07:00

Commit Message:
SCI: Update KQ6 script patch for CD 1.000.000

Changed paths:
    engines/sci/engine/script_patches.cpp


diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index a87420d3c9..74410be27f 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -5118,16 +5118,16 @@ static const uint16 kq6PatchTalkingInventory[] = {
 // Exiting the pawnshop while the Genie's eye is glinting locks up the game.
 //  Unlike the bookstore, the pawnshop script fails to dispose the "eye" object
 //  if it's in the middle of animating, causing the door animation in the next
-//  room to loop forever. Sierra added a simple workaround to the CD version to
+//  room to loop forever. Sierra added a simple workaround in later versions to
 //  prevent this: the eye no longer glints when ego is close the pawnshop exit.
 //  We apply this same workaround to vulnerable versions.
 //
-// Applies to: English, French, and German PC Floppy, English Mac Floppy
+// Applies to: English, French, and German PC Floppy, English Mac Floppy,
+//             English PC CD 1.000.000
 // Responsible method: genieBrowseScr:changeState(3)
 static const uint16 kq6SignaturePawnshopGenieEye[] = {
-	SIG_MAGICDWORD,
-	0x31, 0x37,                         // bnt 37
 	0x39, 0x03,                         // pushi 03
+	SIG_MAGICDWORD,
 	0x7a,                               // push2
 	0x76,                               // push0
 	0x7a,                               // push2
@@ -5141,7 +5141,6 @@ static const uint16 kq6SignaturePawnshopGenieEye[] = {
 };
 
 static const uint16 kq6PatchPawnshopGenieEye[] = {
-	PATCH_ADDTOOFFSET(+2),
 	0x39, 0x43,                         // pushi 43
 	0x78,                               // push1 [ x ]
 	0x76,                               // push0