[Scummvm-cvs-logs] scummvm master -> ce63a325103234a0bd382891b81a7a6ac4f857a2

m-kiewitz m_kiewitz at users.sourceforge.net
Mon Sep 16 21:08:47 CEST 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:
ce63a32510 SCI: QfG1VGA: script patch to fix a typo in a Sierra script -> looking at a cheetaur returned the text for saurus rex, f


Commit: ce63a325103234a0bd382891b81a7a6ac4f857a2
    https://github.com/scummvm/scummvm/commit/ce63a325103234a0bd382891b81a7a6ac4f857a2
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-16T12:07:49-07:00

Commit Message:
SCI: QfG1VGA: script patch to fix a typo in a Sierra script -> looking at a cheetaur returned the text for saurus rex, fixes bug #3604943

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 d4dddb6..6dbdd2b 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -995,14 +995,38 @@ const uint16 qfg1vgaPatchMoveToCastleGate[] = {
 	PATCH_END
 };
 
+// Typo in the original Sierra scripts
+//  Looking at a cheetaur resulted in a text about a Saurus Rex
+//  Code is in smallMonster::doVerb. It treats both monster
+//  types the same. We fix this. Fixes bug #3604943.
+const byte qfg1vgaSignatureCheetaurDescription[] = {
+	16,
+	0x34, 0xb8, 0x01, // ldi 01b8
+	0x1a,             // eq?
+	0x31, 0x16,       // bnt 16
+	0x38, 0x27, 0x01, // pushi 0127
+	0x39, 0x06,       // pushi 06
+	0x39, 0x03,       // pushi 03
+	0x78,             // push1
+	0x39, 0x12,       // pushi 12 -> monster type Saurus Rex
+	0
+};
+
+const uint16 qfg1vgaPatchCheetaurDescription[] = {
+	PATCH_ADDTOOFFSET | +14,
+	0x39, 0x11,       // pushi 11 -> monster type cheetaur
+	PATCH_END
+};
+
 //    script, description,                                      magic DWORD,                                  adjust
 const SciScriptSignature qfg1vgaSignatures[] = {
-	{    215, "fight event issue",                           1, PATCH_MAGICDWORD(0x6d, 0x76, 0x51, 0x07),    -1, qfg1vgaSignatureFightEvents,       qfg1vgaPatchFightEvents },
-	{    216, "weapon master event issue",                   1, PATCH_MAGICDWORD(0x6d, 0x76, 0x51, 0x07),    -1, qfg1vgaSignatureFightEvents,       qfg1vgaPatchFightEvents },
-	{    814, "window text temp space",                      1, PATCH_MAGICDWORD(0x3f, 0xba, 0x87, 0x00),     0, qfg1vgaSignatureTempSpace,         qfg1vgaPatchTempSpace },
-	{    814, "dialog header offset",                        3, PATCH_MAGICDWORD(0x5b, 0x04, 0x80, 0x36),     0, qfg1vgaSignatureDialogHeader,      qfg1vgaPatchDialogHeader },
-	{    331, "moving to crusher",                           1, PATCH_MAGICDWORD(0x51, 0x1f, 0x36, 0x39),     0, qfg1vgaSignatureMoveToCrusher,     qfg1vgaPatchMoveToCrusher },
-	{     41, "moving to castle gate",                       1, PATCH_MAGICDWORD(0x51, 0x1f, 0x36, 0x39),     0, qfg1vgaSignatureMoveToCastleGate,  qfg1vgaPatchMoveToCastleGate },
+	{    215, "fight event issue",                           1, PATCH_MAGICDWORD(0x6d, 0x76, 0x51, 0x07),    -1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
+	{    216, "weapon master event issue",                   1, PATCH_MAGICDWORD(0x6d, 0x76, 0x51, 0x07),    -1, qfg1vgaSignatureFightEvents,         qfg1vgaPatchFightEvents },
+	{    814, "window text temp space",                      1, PATCH_MAGICDWORD(0x3f, 0xba, 0x87, 0x00),     0, qfg1vgaSignatureTempSpace,           qfg1vgaPatchTempSpace },
+	{    814, "dialog header offset",                        3, PATCH_MAGICDWORD(0x5b, 0x04, 0x80, 0x36),     0, qfg1vgaSignatureDialogHeader,        qfg1vgaPatchDialogHeader },
+	{    331, "moving to crusher",                           1, PATCH_MAGICDWORD(0x51, 0x1f, 0x36, 0x39),     0, qfg1vgaSignatureMoveToCrusher,       qfg1vgaPatchMoveToCrusher },
+	{     41, "moving to castle gate",                       1, PATCH_MAGICDWORD(0x51, 0x1f, 0x36, 0x39),     0, qfg1vgaSignatureMoveToCastleGate,    qfg1vgaPatchMoveToCastleGate },
+	{    210, "cheetaur description fixed",                  1, PATCH_MAGICDWORD(0x34, 0xb8, 0x01, 0x1a),     0, qfg1vgaSignatureCheetaurDescription, qfg1vgaPatchCheetaurDescription },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };
 






More information about the Scummvm-git-logs mailing list