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

[fingolfin at users.sourceforge.net]

Revision: 48064
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48064&view=rev
Author:   fingolfin
Date:     2010-02-15 10:01:09 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
SCI: No need to set _executionStackPosChanged in kDisposeScript, as the callk opcode handler does that already

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-02-15 00:20:53 UTC (rev 48063)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-02-15 10:01:09 UTC (rev 48064)
@@ -216,7 +216,7 @@
 	if (argv[0].segment)
 		return s->r_acc;
 
-	int id = s->_segMan->getScriptSegment(script);
+	SegmentId id = s->_segMan->getScriptSegment(script);
 	Script *scr = s->_segMan->getScriptIfLoaded(id);
 	if (scr) {
 		if (s->_executionStack.back().addr.pc.segment != id)
@@ -224,7 +224,6 @@
 	}
 
 	script_uninstantiate(s->_segMan, script);
-	s->_executionStackPosChanged = true;
 
 	if (argc != 2) {
 		return s->r_acc;


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