From bab5050531b7d026d0688ef0eebaf9608c687eb1 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Mon, 6 Sep 2010 10:41:14 +0000 Subject: SCI: fixing code thx to tortoisegit and broken conflict managment svn-id: r52585 --- engines/sci/engine/kscripts.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'engines') diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index a5bf516e13..e7f466f9a2 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -178,7 +178,6 @@ reg_t kClone(EngineState *s, int argc, reg_t *argv) { *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); -- cgit v1.2.3