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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Sep 6 12:41:14 CEST 2010


Revision: 52585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52585&view=rev
Author:   m_kiewitz
Date:     2010-09-06 10:41:14 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
SCI: fixing code

thx to tortoisegit and broken conflict managment

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-06 10:39:42 UTC (rev 52584)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp	2010-09-06 10:41:14 UTC (rev 52585)
@@ -178,7 +178,6 @@
 	*cloneObj = *parentObj;
 
 	// Mark as clone
-	writeSelectorValue(s->_segMan, cloneAddr, SELECTOR(_info_), (infoSelector & ~kInfoFlagClass) | kInfoFlagClone);
 	infoSelector &= ~kInfoFlagClass; // remove class bit
 	writeSelectorValue(s->_segMan, cloneAddr, SELECTOR(_info_), infoSelector | kInfoFlagClone);
 


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