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

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5a8a28bb22 SCI: Add a workaround for a hack used in the NRS script patches for QFG3
a1554b9ddd SCI: Fix the detection of the NRS patch for QFG3


Commit: 5a8a28bb22ac986e2f18a93fd6afd0252b5a2333
    https://github.com/scummvm/scummvm/commit/5a8a28bb22ac986e2f18a93fd6afd0252b5a2333
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-05-22T00:50:39-07:00

Commit Message:
SCI: Add a workaround for a hack used in the NRS script patches for QFG3

The patched script 33 in the NRS patch attempts to perform kAbs() on an
object. Return a dummy value instead. Fixes bugs #3528416 and #3528542

Changed paths:
    engines/sci/engine/workarounds.cpp



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 81c6fbb..c1d4a3d 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -176,6 +176,7 @@ const SciWorkaroundEntry kAbs_workarounds[] = {
 	{ GID_HOYLE1,          2,     2,  0,              "room2", "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // old maid - called with objects instead of integers
 	{ GID_HOYLE1,          3,     3,  0,              "room3", "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // hearts - called with objects instead of integers
 	{ GID_QFG1VGA,        -1,    -1,  0,                 NULL, "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch
+	{ GID_QFG3   ,        -1,    -1,  0,                 NULL, "doit",           -1,    0, { WORKAROUND_FAKE,  0x3e9 } }, // when the game is patched with the NRS patch (bugs #3528416, #3528542)
 	SCI_WORKAROUNDENTRY_TERMINATOR
 };
 


Commit: a1554b9ddd719efc97cbf344fe84d20416810b0b
    https://github.com/scummvm/scummvm/commit/a1554b9ddd719efc97cbf344fe84d20416810b0b
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-05-22T00:50:40-07:00

Commit Message:
SCI: Fix the detection of the NRS patch for QFG3

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 9b0ee69..9600167 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -385,7 +385,7 @@ bool SciEngine::gameHasFanMadePatch() {
 		{ GID_PQ3,        994,   4686,   1291,  0x78 },	// English
 		{ GID_PQ3,        994,   4734,   1283,  0x78 },	// German
 		{ GID_QFG1VGA,    994,   4388,      0,  0x00 },
-		{ GID_QFG3,       994,   4714,      0,  0x00 },
+		{ GID_QFG3,        33,    260,      0,  0x00 },
 		// TODO: Disabled, as it fixes a whole lot of bugs which can't be tested till SCI2.1 support is finished
 		//{ GID_QFG4,       710,  11477,      0,  0x00 },
 		{ GID_SQ1,        994,   4740,      0,  0x00 },