[Scummvm-cvs-logs] scummvm master -> 4ff2b7985b23c0b90653050c7ecaab3fe940ad43

m-kiewitz m_kiewitz at users.sourceforge.net
Sun Dec 8 18:25:23 CET 2013


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:
4ff2b7985b SCI: improve kq6 audio+text patch to include guard2


Commit: 4ff2b7985b23c0b90653050c7ecaab3fe940ad43
    https://github.com/scummvm/scummvm/commit/4ff2b7985b23c0b90653050c7ecaab3fe940ad43
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-12-08T09:24:51-08:00

Commit Message:
SCI: improve kq6 audio+text patch to include guard2

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 cd77087..04e22df 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -1020,19 +1020,18 @@ const uint16 kq6CDPatchAudioTextSupport2[] = {
 };
 
 //  Fixes text window placement, when portrait+text is shown (Guard in room 220)
-// Patched method: tlkGateGuard1::init
-const uint16 kq6CDSignatureAudioTextSupportGuard[] = {
+// Patched method: tlkGateGuard1::init & tlkGateGuard2::init
+const uint16 kq6CDSignatureAudioTextSupportGuards[] = {
 	SIG_MAGICDWORD,
 	0x89, 0x5a,                         // lsg global[5a]
 	0x35, 0x01,                         // ldi 01
 	0x1a,                               // eq?
-	0x31, 0x13,                         // bnt [jump-for-audio-code]
-	SIG_END
+	SIG_END                             // followed by bnt for Guard1 and bt for Guard2
 };
 
-const uint16 kq6CDPatchAudioTextSupportGuard[] = {
-	PATCH_ADDTOOFFSET +5,
-	0x18, 0x18,                         // waste bytes, never jump
+const uint16 kq6CDPatchAudioTextSupportGuards[] = {
+	PATCH_ADDTOOFFSET +2,
+	0x34, PATCH_UINT16 + 0x01, 0x00,    // ldi 0001 (waste 1 byte to overwrite eq?)
 	PATCH_END
 };
 
@@ -1078,7 +1077,7 @@ SciScriptPatcherEntry kq6Signatures[] = {
 	{ false,   928, "CD: audio + text support KQ6&LB2 5",          2, kq6laurabow2CDSignatureAudioTextSupport5, kq6laurabow2CDPatchAudioTextSupport5 },
 	{ false,   909, "CD: audio + text support KQ6 1",              1, kq6CDSignatureAudioTextSupport1,          kq6CDPatchAudioTextSupport1 },
 	{ false,   928, "CD: audio + text support KQ6 2",              1, kq6CDSignatureAudioTextSupport2,          kq6CDPatchAudioTextSupport2 },
-	{ false,  1009, "CD: audio + text support KQ6 Guard",          1, kq6CDSignatureAudioTextSupportGuard,      kq6CDPatchAudioTextSupportGuard },
+	{ false,  1009, "CD: audio + text support KQ6 Guards",         2, kq6CDSignatureAudioTextSupportGuards,     kq6CDPatchAudioTextSupportGuards },
 	{ false,  1027, "CD: audio + text support KQ6 Stepmother",     1, kq6CDSignatureAudioTextSupportStepmother, kq6CDPatchAudioTextSupportJumpAlways },
 	{ false,  1037, "CD: audio + text support KQ6 Gnomes",         1, kq6CDSignatureAudioTextSupportGnomes,     kq6CDPatchAudioTextSupportJumpAlways },
 	SCI_SIGNATUREENTRY_TERMINATOR






More information about the Scummvm-git-logs mailing list