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

[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:
ff15ffef37 SCI: Update SQ4 Text+Audio patch signature


Commit: ff15ffef37d2ce55ba895865720461c1d4749c3d
    https://github.com/scummvm/scummvm/commit/ff15ffef37d2ce55ba895865720461c1d4749c3d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-05-24T12:39:45-06:00

Commit Message:
SCI: Update SQ4 Text+Audio patch signature

Makes the signature more precise so that it's not accidentally applied
to the wrong place when a script already contains this patch.

Fixes incompatibility with NRS' SQ4 Update 1.3

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 b6e9f74bd9..7468154800 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -18941,19 +18941,23 @@ static const uint16 sq4CdPatchSocksDoor[] = {
 //   This is patched to add the "Both" text resource (i.e. we end up with
 //   "Speech", "Text" and "Both")
 static const uint16 sq4CdSignatureTextOptionsButton[] = {
+	0x3c,                               // dup
+	0x35, 0x02,                         // ldi 02
+	0x1a,                               // eq?
+	0x31, 0x20,                         // bnt 20
 	SIG_MAGICDWORD,
-	0x35, 0x01,                         // ldi 0x01
-	0xa1, 0x53,                         // sag global[0x53]
-	0x39, 0x03,                         // pushi 0x03
+	0x35, 0x01,                         // ldi 01
+	0xa1, 0x53,                         // sag global[53]
+	0x39, SIG_SELECTOR8(loop),          // pushi loop
 	0x78,                               // push1
-	0x39, 0x09,                         // pushi 0x09
-	0x54, 0x06,                         // self 0x06
+	0x39, 0x09,                         // pushi 09 "Text"
+	0x54, 0x06,                         // self 06 [ self loop: 9 ]
 	SIG_END
 };
 
 static const uint16 sq4CdPatchTextOptionsButton[] = {
-	PATCH_ADDTOOFFSET(+7),
-	0x39, 0x0b,                         // pushi 0x0b
+	PATCH_ADDTOOFFSET(+13),
+	0x39, 0x0b,                         // pushi 0b "Both"
 	PATCH_END
 };