[Scummvm-git-logs] scummvm master -> 89da6f52d4ba51c8f2d34dc27e1ae2a8022ab752

[sluicebox]

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

Summary:
95ce3673ec SCI: Fix HOYLE1 Demo lockup
89da6f52d4 SCI: Add KQ5 French EGA detection entry


Commit: 95ce3673ec7fe8c9c48b89d18d8b48d50d65aea6
    https://github.com/scummvm/scummvm/commit/95ce3673ec7fe8c9c48b89d18d8b48d50d65aea6
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2026-08-15T14:29:41-07:00

Commit Message:
SCI: Fix HOYLE1 Demo lockup

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 7ed48c73272..3598519f936 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2615,6 +2615,37 @@ static const SciScriptPatcherEntry freddypharkasSignatures[] = {
 
 // ===========================================================================
 
+// WORKAROUND
+// The Hoyle1 demo gets stuck waiting for a sound to stop in ScummVM because the
+//  User script skips calling kGetEvent. ScummVM updates SCI0 music cues from
+//  kGetEvent based on the assumption that it's a frequently called function.
+//
+// We work around this by disabling the code in User:doit that skips kGetEvent.
+//  This doesn't have any noticeable affect on this short demo. The game scrips
+//  already disable the player and prevent input.
+//
+// Applies to: PC Demo
+// Responsible method: User:doit
+static const uint16 hoyle1SignatureDemoEvents[] = {
+	SIG_MAGICDWORD,
+	0x80, SIG_UINT16(0x0302),          // lag 0302 [ demo flag ]
+	0x30,                              // bnt
+	SIG_END
+};
+
+static const uint16 hoyle1PatchDemoEvents[] = {
+	0x34, PATCH_UINT16(0x0000),       // ldi 0000
+	PATCH_END
+};
+
+//          script, description,                                      signature                         patch
+static const SciScriptPatcherEntry hoyle1Signatures[] = {
+	{  true,   996, "demo events",                                 1, hoyle1SignatureDemoEvents,        hoyle1PatchDemoEvents },
+	SCI_SIGNATUREENTRY_TERMINATOR
+};
+
+// ===========================================================================
+
 // During Bridge, Declarer_Second_NT:think performs a bitwise or against an
 //  object due to a script typo. This operation is supposed to be against
 //  (bridgeHand:highCard):rank but instead it's against bridgeHand:highCard.
@@ -27038,6 +27069,9 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) {
 	case GID_FREDDYPHARKAS:
 		signatureTable = freddypharkasSignatures;
 		break;
+	case GID_HOYLE1:
+		signatureTable = hoyle1Signatures;
+		break;
 	case GID_HOYLE4:
 		signatureTable = hoyle4Signatures;
 		break;


Commit: 89da6f52d4ba51c8f2d34dc27e1ae2a8022ab752
    https://github.com/scummvm/scummvm/commit/89da6f52d4ba51c8f2d34dc27e1ae2a8022ab752
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2026-08-15T14:29:41-07:00

Commit Message:
SCI: Add KQ5 French EGA detection entry

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 56ed36975c4..d47acc856c4 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2274,6 +2274,23 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::DE_DEU, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
+	// King's Quest 5 - French DOS EGA (3.5" 720k disks)
+	// Game version 0.000.143 from about box, 1.000 from VERSION file
+	// SCI interpreter version 1.000.782
+	{"kq5", "EGA", {
+		{"resource.map", 0, "30ced377384f2ef42d89efa9f0a99eec", 8193},
+		{"resource.000", 0, "238364f82d48d0b6896dac22e897df93", 443131},
+		{"resource.001", 0, "98264221cbed38c8a8f5da8634b13218", 622057},
+		{"resource.002", 0, "51b8485110fb99d1625d46fb1a6758f5", 712514},
+		{"resource.003", 0, "daaa2edb3aba362171322fdcc29f0ac8", 558493},
+		{"resource.004", 0, "bef90d755076c110e67ee3e635503f82", 683010},
+		{"resource.005", 0, "1a3672476df51842488d657e97cd14ed", 726961},
+		{"resource.006", 0, "f7dc85307632ef657ceb1651204f6f51", 652108},
+		{"resource.007", 0, "7db4d0a1d8d547c0019cb7d2a6acbdd4", 716483},
+		{"resource.008", 0, "1bbecd2545b42329914fe7a84970c79b", 693470},
+		AD_LISTEND},
+		Common::FR_FRA, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16 },
+
 	// King's Quest 5 - French DOS Floppy (from the King's Quest Collector's Edition 1994, also includes english language)
 	// Supplied by aroenai in bug report #4378
 	// VERSION file reports "1.000", SCI interpreter version 1.000.784