[Scummvm-cvs-logs] SF.net SVN: scummvm:[44051] scummvm/branches/branch-1-0-0/engines/tinsel/ pcode.cpp

[dreammaster at users.sourceforge.net]

Revision: 44051
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44051&view=rev
Author:   dreammaster
Date:     2009-09-13 11:00:47 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
Backport of workaround fix for Amazon conversation being cut off in Act 2

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/tinsel/pcode.cpp

Modified: scummvm/branches/branch-1-0-0/engines/tinsel/pcode.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/tinsel/pcode.cpp	2009-09-13 10:58:31 UTC (rev 44050)
+++ scummvm/branches/branch-1-0-0/engines/tinsel/pcode.cpp	2009-09-13 11:00:47 UTC (rev 44051)
@@ -130,6 +130,8 @@
 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 @@
 	{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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.