thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: another script patch for KQ6 text+audio support

Browse source 
fixes hires issues
This commit is contained in:
Martin Kiewitz 2013-12-08 14:41:29 +01:00
parent f835723aab
commit 4b732534c2
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
engines/sci/engine/script_patches.cpp
View file

@ -953,9 +953,10 @@ const uint16 kq6laurabow2CDSignatureAudioTextSupport4[] = {
}; };
const uint16 kq6laurabow2CDPatchAudioTextSupport4[] = { const uint16 kq6laurabow2CDPatchAudioTextSupport4[] = {
PATCH_ADDTOOFFSET +5, PATCH_ADDTOOFFSET +2,
0x18, // not (never jump here) 0x34, PATCH_UINT16 + 0x01, 0x00, // ldi 0001 (waste 1 byte)
0x18, // not (never jump here) 0x12,
0x18, // not - prepares acc for KQ6 talker::startText
PATCH_ADDTOOFFSET +19, PATCH_ADDTOOFFSET +19,
0x89, 98, // lsp global[98d] 0x89, 98, // lsp global[98d]
PATCH_END PATCH_END
@ -994,6 +995,30 @@ const uint16 kq6CDPatchAudioTextSupport1[] = {
PATCH_END PATCH_END
}; };
// Additional patches specifically for King's Quest 6
// Fixes low-res portrait staying on screen for hi-res mode
// Patched method: Talker::startText
// this method is called by Narrator::say and acc is 0 for text-only and true for audio+text
const uint16 kq6CDSignatureAudioTextSupport2[] = {
SIG_MAGICDWORD,
0x3f, 0x01, // link 01
0x63, 0x8a, // pToa viewInPrint
0x18, // not
0x31, 0x06, // bnt [skip following code]
0x38, SIG_UINT16 + 0xe1, 0x00, // pushi 00e1
0x76, // push0
0x54, 0x04, // self 04
SIG_END
};
const uint16 kq6CDPatchAudioTextSupport2[] = {
PATCH_ADDTOOFFSET +2,
0x67, 0x8a, // pTos viewInPrint
0x14, // or
0x2f, // bt [skip following code]
PATCH_END
};
// Fixes text window placement, when portrait+text is shown (Guard in room 220) // Fixes text window placement, when portrait+text is shown (Guard in room 220)
// Patched method: tlkGateGuard1::init // Patched method: tlkGateGuard1::init
const uint16 kq6CDSignatureAudioTextSupportGuard[] = { const uint16 kq6CDSignatureAudioTextSupportGuard[] = {
@ -1045,14 +1070,14 @@ SciScriptPatcherEntry kq6Signatures[] = {
{ true, 907, "inventory stack fix", 1, kq6SignatureInventoryStackFix, kq6PatchInventoryStackFix }, { true, 907, "inventory stack fix", 1, kq6SignatureInventoryStackFix, kq6PatchInventoryStackFix },
// King's Quest 6 and Laura Bow 2 share basic patches for audio + text support // King's Quest 6 and Laura Bow 2 share basic patches for audio + text support
// *** King's Quest 6 audio + text support *** // *** King's Quest 6 audio + text support ***
// ToDO: fix window placement+size for dialog w/o portraits (lowres+hires) // TODO: all window placements seems to be fixed, game should be played through to check for any more issues
// TODO: fix lowres portraits staying on screen when hires portraits are used
{ false, 924, "CD: audio + text support KQ6&LB2 1", 1, kq6laurabow2CDSignatureAudioTextSupport1, kq6laurabow2CDPatchAudioTextSupport1 }, { false, 924, "CD: audio + text support KQ6&LB2 1", 1, kq6laurabow2CDSignatureAudioTextSupport1, kq6laurabow2CDPatchAudioTextSupport1 },
{ false, 924, "CD: audio + text support KQ6&LB2 2", 1, kq6laurabow2CDSignatureAudioTextSupport2, kq6laurabow2CDPatchAudioTextSupport2 }, { false, 924, "CD: audio + text support KQ6&LB2 2", 1, kq6laurabow2CDSignatureAudioTextSupport2, kq6laurabow2CDPatchAudioTextSupport2 },
{ false, 924, "CD: audio + text support KQ6&LB2 3", 1, kq6laurabow2CDSignatureAudioTextSupport3, kq6laurabow2CDPatchAudioTextSupport3 }, { false, 924, "CD: audio + text support KQ6&LB2 3", 1, kq6laurabow2CDSignatureAudioTextSupport3, kq6laurabow2CDPatchAudioTextSupport3 },
{ false, 928, "CD: audio + text support KQ6&LB2 4", 1, kq6laurabow2CDSignatureAudioTextSupport4, kq6laurabow2CDPatchAudioTextSupport4 }, { false, 928, "CD: audio + text support KQ6&LB2 4", 1, kq6laurabow2CDSignatureAudioTextSupport4, kq6laurabow2CDPatchAudioTextSupport4 },
{ false, 928, "CD: audio + text support KQ6&LB2 5", 2, kq6laurabow2CDSignatureAudioTextSupport5, kq6laurabow2CDPatchAudioTextSupport5 }, { false, 928, "CD: audio + text support KQ6&LB2 5", 2, kq6laurabow2CDSignatureAudioTextSupport5, kq6laurabow2CDPatchAudioTextSupport5 },
{ false, 909, "CD: audio + text support KQ6 1", 1, kq6CDSignatureAudioTextSupport1, kq6CDPatchAudioTextSupport1 }, { 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 Guard", 1, kq6CDSignatureAudioTextSupportGuard, kq6CDPatchAudioTextSupportGuard },
{ false, 1027, "CD: audio + text support KQ6 Stepmother", 1, kq6CDSignatureAudioTextSupportStepmother, kq6CDPatchAudioTextSupportJumpAlways }, { false, 1027, "CD: audio + text support KQ6 Stepmother", 1, kq6CDSignatureAudioTextSupportStepmother, kq6CDPatchAudioTextSupportJumpAlways },
{ false, 1037, "CD: audio + text support KQ6 Gnomes", 1, kq6CDSignatureAudioTextSupportGnomes, kq6CDPatchAudioTextSupportJumpAlways }, { false, 1037, "CD: audio + text support KQ6 Gnomes", 1, kq6CDSignatureAudioTextSupportGnomes, kq6CDPatchAudioTextSupportJumpAlways },