[Scummvm-git-logs] scummvm master -> 88981b8db6881cc6c40a0409e27d49aca4835057

[csnover]

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:
88981b8db6 SCI32: Script patch priority drawing bug in MGDX


Commit: 88981b8db6881cc6c40a0409e27d49aca4835057
    https://github.com/scummvm/scummvm/commit/88981b8db6881cc6c40a0409e27d49aca4835057
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-16T12:54:39-06:00

Commit Message:
SCI32: Script patch priority drawing bug in MGDX

This fixes the horse at the fountain drawing on top of the
fountain instead of behind it.

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 968d727..c542be7 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -2962,9 +2962,31 @@ static const uint16 mothergooseHiresPatchLogo[] = {
 	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 mothergooseHiresSignatureHorse[] = {
+	SIG_MAGICDWORD,
+	0x39, 0x4a,             // pushi $4a (setPri)
+	0x78,                   // push1
+	0x38, SIG_UINT16(0xb7), // pushi $b7
+	SIG_END
+};
+
+static const uint16 mothergooseHiresPatchHorse[] = {
+	PATCH_ADDTOOFFSET(3),
+	0x38, PATCH_UINT16(0x59),
+	PATCH_END
+};
+
 //          script, description,                                      signature                         patch
 static const SciScriptPatcherEntry mothergooseHiresSignatures[] = {
 	{  true,   108, "bad logo rendering",                          1, mothergooseHiresSignatureLogo,    mothergooseHiresPatchLogo },
+	{  true,   318, "bad horse z-index",                           1, mothergooseHiresSignatureHorse,   mothergooseHiresPatchHorse },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };