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

lskovlun at users.sourceforge.net lskovlun at users.sourceforge.net
Mon Sep 6 12:11:07 CEST 2010


Revision: 52583
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52583&view=rev
Author:   lskovlun
Date:     2010-09-06 10:11:07 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
SCI: Clear class bit when cloning objects.
This fixes a regression affecting many SCI32 games and possibly other games,
looping or recursing endlessly.

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-09-05 23:17:52 UTC (rev 52582)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-09-06 10:11:07 UTC (rev 52583)
@@ -178,7 +178,7 @@
 	*cloneObj = *parentObj;
 
 	// Mark as clone
-	writeSelectorValue(s->_segMan, cloneAddr, SELECTOR(_info_), infoSelector | kInfoFlagClone);
+	writeSelectorValue(s->_segMan, cloneAddr, SELECTOR(_info_), (infoSelector & ~kInfoFlagClass) | kInfoFlagClone);
 
 	cloneObj->setSpeciesSelector(cloneObj->getPos());
 	if (parentObj->isClass())


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