aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorPaul Gilbert2009-09-13 10:58:31 +0000
committerPaul Gilbert2009-09-13 10:58:31 +0000
commit31585ebac06014db420bf2688036b935f54a4082 (patch)
tree5eefd938f7c932c6ec31ea18940b034d9a6d6a1c /engines/tinsel
parent6c9ab139afb4fd7092ecb8bf97a47f6c097e4a07 (diff)
downloadscummvm-rg350-31585ebac06014db420bf2688036b935f54a4082.tar.gz
scummvm-rg350-31585ebac06014db420bf2688036b935f54a4082.tar.bz2
scummvm-rg350-31585ebac06014db420bf2688036b935f54a4082.zip
Added workaround fix for Amazon conversation being cut off in Act 2
svn-id: r44050
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/pcode.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index adfd31e7f7..157982ce84 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -130,6 +130,8 @@ const byte fragment7[] = {OP_IMM | OPSIZE16, 908 % 256, 908 / 256, OP_JUMP | OPS
const int fragment7_size = 6;
const byte fragment8[] = {OP_IMM | OPSIZE16, 910 % 256, 910 / 256, OP_JUMP | OPSIZE16, 644 % 256, 644 / 256};
const int fragment8_size = 6;
+const byte fragment9[] = {OP_JUMP | OPSIZE8, 123};
+const int fragment9_size = 2;
const WorkaroundEntry workaroundList[] = {
// DW1-SCN: Global 206 is whether Rincewind is trying to take the book back to the present.
@@ -153,6 +155,10 @@ const WorkaroundEntry workaroundList[] = {
{TINSEL_V1, false, 310506872, 613, fragment7_size, fragment7},
{TINSEL_V1, false, 310506872, 641, fragment8_size, fragment8},
+ // DW1-SCN: The script for the lovable street-Starfish does a 'StopSample' after flicking the coin to ensure it's
+ // sound is stopped, but which also accidentally can stop any active conversation with the Amazon
+ {TINSEL_V1, true, 394640351, 121, fragment9_size, fragment9},
+
// DW2: In the garden, global #490 is set when the bees begin their 'out of hive' animation, and reset when done.
// But if the game is saved/restored during it, the animation sequence is reset without the global being cleared.
// This causes bugs in several actions which try to disable the bees animation, since they wait indefinitely for