[Scummvm-cvs-logs] scummvm master -> 94a03b6a45d686b3608427e84f6fe87c28107ca9

m-kiewitz m_kiewitz at users.sourceforge.net
Fri Feb 26 00:07:19 CET 2016


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:
94a03b6a45 SCI: Make Freddy Pharkas intro scaling patch more generic


Commit: 94a03b6a45d686b3608427e84f6fe87c28107ca9
    https://github.com/scummvm/scummvm/commit/94a03b6a45d686b3608427e84f6fe87c28107ca9
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-26T00:08:02+01:00

Commit Message:
SCI: Make Freddy Pharkas intro scaling patch more generic

So that hopefully the signature will match for all versions

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 1f63f1c..fc0dca5 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -419,10 +419,10 @@ static const SciScriptPatcherEntry fanmadeSignatures[] = {
 // Applies to at least: English PC-CD
 // Responsible method: sTownScript::changeState(1), sTownScript::changeState(3) (script 110)
 static const uint16 freddypharkasSignatureIntroScaling[] = {
-	0x38, SIG_UINT16(0x009b),        // pushi 009b (setLoop)
+	0x38, SIG_ADDTOOFFSET(+2),       // pushi (setLoop) (009b for PC CD)
 	0x78,                            // push1
 	PATCH_ADDTOOFFSET(1),            // push0 for first code, push1 for second code
-	0x38, SIG_UINT16(0x0143),        // pushi 0143 (setStep)
+	0x38, SIG_ADDTOOFFSET(+2),       // pushi (setStep) (0143 for PC CD)
 	0x7a,                            // push2
 	0x39, 0x05,                      // pushi 05
 	0x3c,                            // dup
@@ -441,7 +441,9 @@ static const uint16 freddypharkasSignatureIntroScaling[] = {
 
 static const uint16 freddypharkasPatchIntroScaling[] = {
 	// remove setLoop(), objects in heap are already prepared, saves 5 bytes
-	0x38, PATCH_UINT16(0x0143),      // pushi 0143 (setStep)
+	0x38,
+	PATCH_GETORIGINALBYTE(+6),
+	PATCH_GETORIGINALBYTE(+7),       // pushi (setStep)
 	0x7a,                            // push2
 	0x39, 0x05,                      // pushi 05
 	0x3c,                            // dup






More information about the Scummvm-git-logs mailing list