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

[thebluegr at users.sourceforge.net]

Revision: 43875
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43875&view=rev
Author:   thebluegr
Date:     2009-09-01 06:45:30 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
Fixed the crash at the beginning of EcoQuest 1 CD

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

Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp	2009-09-01 06:21:23 UTC (rev 43874)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2009-09-01 06:45:30 UTC (rev 43875)
@@ -301,7 +301,9 @@
 	Script *scr = s->segmentManager->getScriptIfLoaded(id);
 	if (scr) {
 		if (s->_executionStack.back().addr.pc.segment != id)
-			scr->setLockers(1);
+			// Lockers must be > 1, otherwise it won't have any effect on script_uninstantiate() below,
+			// because it decreases the lockers by 1. This occurs for example at the beginning of EcoQuest CD
+			scr->setLockers(2);
 	}
 
 	script_uninstantiate(s->segmentManager, script);


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