[Scummvm-cvs-logs] SF.net SVN: scummvm:[50352] scummvm/trunk/engines/sci/engine/kscripts.cpp

[thebluegr at users.sourceforge.net]

Revision: 50352
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50352&view=rev
Author:   thebluegr
Date:     2010-06-26 22:50:39 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Added a workaround for broken script 377 in Castle of Dr. Brain, room 320. It constantly tries to free the saved area rectangle (underbits) underneath the popup window

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kscripts.cpp

Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-26 22:48:47 UTC (rev 50351)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-06-26 22:50:39 UTC (rev 50352)
@@ -80,6 +80,14 @@
 		ResourceType restype = (ResourceType)(argv[0].toUint16() & 0x7f);
 		reg_t resnr = argv[1];
 
+		// WORKAROUND for a broken script in room 320 in Castle of Dr. Brain.
+		// Script 377 tries to free the hunk memory allocated for the saved area
+		// (underbits) beneath the pop up window, which results in having the
+		// window stay on screen even when it's closed. Ignore this request here.
+		if (restype == kResourceTypeMemory && g_sci->getGameId() == GID_CASTLEBRAIN &&
+			s->currentRoomNumber() == 320)
+			return s->r_acc;
+
 		if (restype == kResourceTypeMemory)
 			s->_segMan->freeHunkEntry(resnr);
 


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