[Scummvm-cvs-logs] scummvm master -> 39efe3999a9531f7e2898f15c2afdad3d294e3f2

m-kiewitz m_kiewitz at users.sourceforge.net
Thu Nov 21 12:10:39 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:
39efe3999a SCI: improved lb2/kq6 patch


Commit: 39efe3999a9531f7e2898f15c2afdad3d294e3f2
    https://github.com/scummvm/scummvm/commit/39efe3999a9531f7e2898f15c2afdad3d294e3f2
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-11-21T03:10:07-08:00

Commit Message:
SCI: improved lb2/kq6 patch

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 6d279c0..0043f21 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -138,8 +138,9 @@ SciScriptPatcherSelector selectorTable[] = {
 	{ "put",               -1, }, // Police Quest 1 VGA
 	{ "solvePuzzle",       -1, }, // Quest For Glory 3
 	{ "timesShownID",      -1, }, // Space Quest 1 VGA
-	{ "startText",         -1, }, // King's Quest 6 CD / Laura Bow 2 CD
-	{ "startAudio",        -1, }, // King's Quest 6 CD / Laura Bow 2 CD
+	{ "startText",         -1, }, // King's Quest 6 CD / Laura Bow 2 CD for audio+text support
+	{ "startAudio",        -1, }, // King's Quest 6 CD / Laura Bow 2 CD for audio+text support
+	{ "modNum",            -1, }, // King's Quest 6 CD / Laura Bow 2 CD for audio+text support
 	{ NULL,                -1 }
 };
 
@@ -161,7 +162,8 @@ enum ScriptPatcherSelectors {
 	SELECTOR_solvePuzzle,
 	SELECTOR_timesShownID,
 	SELECTOR_startText,
-	SELECTOR_startAudio
+	SELECTOR_startAudio,
+	SELECTOR_modNum
 };
 
 // ===========================================================================
@@ -920,12 +922,12 @@ const uint16 kq6PatchInventoryStackFix[] = {
 //  We currently use global 98d to hold a kMemory pointer.
 // Patched method: Messager::sayNext / lb2Messager::sayNext (always use text branch)
 const uint16 kq6laurabow2CDSignatureAudioTextSupport1[] = {
-	SIG_MAGICDWORD,
 	0x89, 0x5a,                         // lsg global[5a]
 	0x35, 0x02,                         // ldi 02
 	0x12,                               // and
+	SIG_MAGICDWORD,
 	0x31, 0x13,                         // bnt [audio call]
-	0x38, SIG_ADDTOOFFSET +1, 0x00,     // pushi 00de (lb2) / pushi 00df (kq6)
+	0x38, SIG_SELECTOR16 + SELECTOR_modNum, // pushi modNum
 	SIG_END
 };
 






More information about the Scummvm-git-logs mailing list