[Scummvm-cvs-logs] scummvm master -> 0382e990ec5b2f00860901f443f8ddcf22f68ed0
bluegr
md5 at scummvm.org
Thu Aug 25 02:10:38 CEST 2011
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:
0382e990ec SCI: Fixed QFG3 bug #3377429, by removing the problematic script patch
Commit: 0382e990ec5b2f00860901f443f8ddcf22f68ed0
https://github.com/scummvm/scummvm/commit/0382e990ec5b2f00860901f443f8ddcf22f68ed0
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-08-24T17:06:20-07:00
Commit Message:
SCI: Fixed QFG3 bug #3377429, by removing the problematic script patch
for script 23 (bug #3040722).
This script patch messes up the conversation with Manu the monkey later
on in the game, thus it's not correct.
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 a714980..7efcb42 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -855,26 +855,8 @@ const uint16 qfg3PatchImportDialog[] = {
PATCH_END
};
-// Script 23 in QFG3 has a typo/bug which makes it loop endlessly and
-// read garbage. Fixes bug #3040722.
-const byte qfg3DialogCrash[] = {
- 5,
- 0x34, 0xe7, 0x03, // ldi 3e7 (999)
- 0x22, // lt?
- 0x33, // jmp [back] ---> BUG! Infinite loop
- 0
-};
-
-const uint16 qfg3PatchDialogCrash[] = {
- 0x34, 0xe7, 0x03, // ldi 3e7 (999)
- 0x22, // lt?
- 0x31, // bnt [back]
- PATCH_END
-};
-
// script, description, magic DWORD, adjust
const SciScriptSignature qfg3Signatures[] = {
- { 23, "dialog crash", 1, PATCH_MAGICDWORD(0xe7, 0x03, 0x22, 0x33), -1, qfg3DialogCrash, qfg3PatchDialogCrash },
{ 944, "import dialog continuous calls", 1, PATCH_MAGICDWORD(0x2a, 0x31, 0x0b, 0x7a), -1, qfg3SignatureImportDialog, qfg3PatchImportDialog },
SCI_SIGNATUREENTRY_TERMINATOR
};
More information about the Scummvm-git-logs
mailing list