[Scummvm-git-logs] scummvm master -> 77bdb61fb81b6702019ba2579dde270dc3b25846

[bluegr]

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

Summary:
77bdb61fb8 SCI: Disable "ride unicorn at night" for KQ4 demo


Commit: 77bdb61fb81b6702019ba2579dde270dc3b25846
    https://github.com/scummvm/scummvm/commit/77bdb61fb81b6702019ba2579dde270dc3b25846
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-04-28T10:14:50+03:00

Commit Message:
SCI: Disable "ride unicorn at night" for KQ4 demo

This patch is not compatible with the demo, and will cause it to crash
with a "Send to invalid selector" error.

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 68bc8e6ba2c..ff29d3f4d3f 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -5730,7 +5730,7 @@ static const SciScriptPatcherEntry kq4Signatures[] = {
 	{  true,    99, "fix speed test overflow",                     1, sci0SpeedTestOverflowSignature,           sci0SpeedTestOverflowPatch },
 	{  true,   994, "restore fix",                                 1, kq4SignatureRestoreFix1,                  kq4PatchRestoreFix1 },
 	{  true,   994, "restore fix",                                 1, kq4SignatureRestoreFix2,                  kq4PatchRestoreFix2 },
-	{  true,   994, "ride unicorn at night",                       1, kq4SignatureUnicornNightRide,             kq4PatchUnicornNightRide },
+	{  false,  994, "ride unicorn at night",                       1, kq4SignatureUnicornNightRide,             kq4PatchUnicornNightRide },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 
@@ -26427,6 +26427,9 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) {
 				if (!g_sci->getResMan()->testResource(ResourceId(kResourceTypeView, 653))) {
 					enablePatch(signatureTable, "missing waterfall view");
 				}
+				if (!g_sci->isDemo()) {
+					enablePatch(signatureTable, "ride unicorn at night");
+				}
 				break;
 			case GID_KQ5:
 				if (g_sci->_features->useAltWinGMSound()) {