diff options
| author | Martin Kiewitz | 2010-09-06 10:41:14 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-09-06 10:41:14 +0000 |
| commit | bab5050531b7d026d0688ef0eebaf9608c687eb1 (patch) | |
| tree | 2ef38df46fe519c648b93dff16a256fb716365b0 /engines | |
| parent | c342c0e3d8d3cc551fa3cc3b12a039f9a0303d66 (diff) | |
| download | scummvm-rg350-bab5050531b7d026d0688ef0eebaf9608c687eb1.tar.gz scummvm-rg350-bab5050531b7d026d0688ef0eebaf9608c687eb1.tar.bz2 scummvm-rg350-bab5050531b7d026d0688ef0eebaf9608c687eb1.zip | |
SCI: fixing code
thx to tortoisegit and broken conflict managment
svn-id: r52585
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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); |