[Scummvm-cvs-logs] SF.net SVN: scummvm:[50360] scummvm/trunk/engines/tinsel/pcode.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Jun 27 03:06:51 CEST 2010


Revision: 50360
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50360&view=rev
Author:   dreammaster
Date:     2010-06-27 01:06:51 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Script workaround fix for bug #2917661 - Crash when interacting with D'Blah

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/pcode.cpp

Modified: scummvm/trunk/engines/tinsel/pcode.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/pcode.cpp	2010-06-27 00:08:00 UTC (rev 50359)
+++ scummvm/trunk/engines/tinsel/pcode.cpp	2010-06-27 01:06:51 UTC (rev 50360)
@@ -148,6 +148,7 @@
 		OP_ONE, OP_LIBCALL | OPSIZE8, 14,									// Re-show the cursor
 		OP_IMM | OPSIZE16, FRAGMENT_WORD(322), OP_LIBCALL | OPSIZE8, 46,	// Give back the whistle
 		OP_JUMP | OPSIZE16, FRAGMENT_WORD(1568)};
+static const byte fragment13[] = {OP_ZERO, OP_GSTORE | OPSIZE16, FRAGMENT_WORD(306)};
 
 #undef FRAGMENT_WORD
 
@@ -207,6 +208,12 @@
 	// See bug report #2934211.
 	{TINSEL_V1, true, 352601285, 1569, sizeof(fragment11), fragment11},
 	{TINSEL_V1, false, 352602304, 1488, sizeof(fragment12), fragment12},
+	
+	// DW2: Corrects a bug with global 306 not being cleared if you leave
+	// the marketplace scene whilst D'Blah is talking (even if it's not
+	// actually audible); returning to the scene and clicking on him multiple 
+	// times would cause the game to crash
+	{TINSEL_V2, true, 1109294728, 0, sizeof(fragment13), fragment13},
 
 	{TINSEL_V0, false, 0, 0, 0, NULL}
 };


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




More information about the Scummvm-git-logs mailing list