aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorDavid Fioramonti2018-01-04 20:32:08 -0800
committerColin Snover2018-01-16 21:32:38 -0600
commit9518fd7210a371ded3a482acbcb34777fd6dd51c (patch)
tree6930d96c7ad86a274c3dae817a660705e401209e /engines
parente96d32e07ff9cef1d1d08144ee81fad1357d9bc8 (diff)
downloadscummvm-rg350-9518fd7210a371ded3a482acbcb34777fd6dd51c.tar.gz
scummvm-rg350-9518fd7210a371ded3a482acbcb34777fd6dd51c.tar.bz2
scummvm-rg350-9518fd7210a371ded3a482acbcb34777fd6dd51c.zip
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.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/script_patches.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 96ac9388cc..254bfdb14c 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
};