[Scummvm-git-logs] scummvm master -> 21b6ea143f8ed7789ce08b10700445bf4e883dfb

[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:
21b6ea143f SCI32: Delete Mother Goose Banbury Cross script patch


Commit: 21b6ea143f8ed7789ce08b10700445bf4e883dfb
    https://github.com/scummvm/scummvm/commit/21b6ea143f8ed7789ce08b10700445bf4e883dfb
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-09-07T14:57:23-05:00

Commit Message:
SCI32: Delete Mother Goose Banbury Cross script patch

This script patch caused the bug it claimed to fix.

It appears that during SCI32 development in 2017, a bug sent the horse
at Banbury Cross on an incorrect path behind the fountain instead of in
front of it. This would have looked glitchy since the horse has a higher
priority than the fountain. But this was misdiagnosed as a priority bug,
even though the original doesn't have any problems, and the script was
patched to set the horse to a lower priority. The real ScummVM bug was
fixed some time later, and ever since the horse has taken the correct
path and looked glitchy due to the patch setting the wrong priority.

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 e0cde36520..f90b87adee 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -9838,33 +9838,11 @@ static const uint16 mothergooseHiresLogoPatch[] = {
 	PATCH_END
 };
 
-// After finishing the rhyme at the fountain, a horse will appear and walk
-// across the screen. The priority of the horse is set too high, so it is
-// rendered in front of the fountain instead of behind the fountain. This patch
-// corrects the priority so the horse draws behind the fountain.
-//
-// Applies to at least: English CD from King's Quest Collection
-// Responsible method: rhymeScript::changeState
-static const uint16 mothergooseHiresHorseSignature[] = {
-	SIG_MAGICDWORD,
-	0x39, SIG_SELECTOR8(setPri), // pushi setPri ($4a)
-	0x78,                        // push1
-	0x38, SIG_UINT16(0x00b7),    // pushi $b7
-	SIG_END
-};
-
-static const uint16 mothergooseHiresHorsePatch[] = {
-	PATCH_ADDTOOFFSET(+3),    // pushi setPri, push1
-	0x38, PATCH_UINT16(0x59), // pushi $59
-	PATCH_END
-};
-
 //          script, description,                                      signature                         patch
 static const SciScriptPatcherEntry mothergooseHiresSignatures[] = {
 	{  true,     0, "disable volume reset on startup (1/2)",       2, sci2VolumeResetSignature,         sci2VolumeResetPatch },
 	{  true,    90, "disable volume reset on startup (2/2)",       1, sci2VolumeResetSignature,         sci2VolumeResetPatch },
 	{  true,   108, "fix bad logo rendering",                      1, mothergooseHiresLogoSignature,    mothergooseHiresLogoPatch },
-	{  true,   318, "fix bad horse z-index",                       1, mothergooseHiresHorseSignature,   mothergooseHiresHorsePatch },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };