[Scummvm-git-logs] scummvm master -> 9518fd7210a371ded3a482acbcb34777fd6dd51c

[csnover]

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:
9518fd7210 SCI32: Fix PQ4 Barbie shoe points patch selector


Commit: 9518fd7210a371ded3a482acbcb34777fd6dd51c
    https://github.com/scummvm/scummvm/commit/9518fd7210a371ded3a482acbcb34777fd6dd51c
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-01-16T21:32:38-06:00

Commit Message:
SCI32: Fix PQ4 Barbie shoe points patch selector

The original script patch had the correct literal value but the
wrong selector name in the comment for the literal value, so when
it was converted to use a selector lookup in
c5dce17b1f1392feb8825aba5addbc3999eeaa51, the patch broke because
the wrong selector name was used.

Fixes Trac#10392. Closes gh-1107.

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 96ac938..254bfdb 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -141,7 +141,7 @@ static const char *const selectorNameTable[] = {
 	"setScale",     // LSL6hires
 	"setScaler",    // LSL6hires
 	"readWord",     // LSL7, Phant1, Torin
-	"flag",         // PQ4
+	"points",       // PQ4
 	"select",       // PQ4
 	"handle",       // RAMA
 	"saveFilePtr",  // RAMA
@@ -214,7 +214,7 @@ enum ScriptPatcherSelectors {
 	SELECTOR_setScale,
 	SELECTOR_setScaler,
 	SELECTOR_readWord,
-	SELECTOR_flag,
+	SELECTOR_points,
 	SELECTOR_select,
 	SELECTOR_handle,
 	SELECTOR_saveFilePtr,
@@ -4644,7 +4644,7 @@ static const uint16 pq4CdSpeechAndSubtitlesPatch[] = {
 // bar earlier in the game, and checks local 3 then, so just check local 3 in
 // both cases to prevent the game from appearing to be in an unwinnable state
 // just because the player interacted in the "wrong" order.
-// Applies to at least: English floppy, German floppy, English CD
+// Applies to at least: English floppy, German floppy, English CD, German CD
 static const uint16 pq4BittyKittyShowBarieRedShoeSignature[] = {
 	// stripper::noun check is for checking, if police badge was shown
 	SIG_MAGICDWORD,
@@ -4652,7 +4652,7 @@ static const uint16 pq4BittyKittyShowBarieRedShoeSignature[] = {
 	0x35, 0x02,                         // ldi 2
 	0x1e,                               // gt?
 	0x30, SIG_UINT16(0x0028),           // bnt [skip 2 points code]
-	0x39, SIG_SELECTOR8(flag),          // pushi $61 (flag)
+	0x39, SIG_SELECTOR8(points),       // pushi $61 (points)
 	SIG_END
 };