diff options
| author | Filippos Karapetis | 2010-06-03 10:16:21 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-03 10:16:21 +0000 |
| commit | 86b452d36cb781c24e1b167dd6cef768b7c6286b (patch) | |
| tree | 97a66ac538ca14982f082d4ca93c5c90c98f4a6c /engines/sci/engine/kscripts.cpp | |
| parent | 86dcc28342021933f04ff3542932fc8823ff2360 (diff) | |
| download | scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.tar.gz scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.tar.bz2 scummvm-rg350-86b452d36cb781c24e1b167dd6cef768b7c6286b.zip | |
Moved several object-related defines inside vm.h into segment.h, where the Object class resides. Also, removed several unused defines
svn-id: r49406
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 2f260bc03a..722d0175d1 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -132,7 +132,7 @@ reg_t kClone(EngineState *s, int argc, reg_t *argv) { *clone_obj = *parent_obj; // Mark as clone - clone_obj->setInfoSelector(make_reg(0, SCRIPT_INFO_CLONE)); + clone_obj->markAsClone(); clone_obj->setSpeciesSelector(clone_obj->getPos()); if (parent_obj->isClass()) clone_obj->setSuperClassSelector(parent_obj->getPos()); @@ -154,7 +154,7 @@ reg_t kDisposeClone(EngineState *s, int argc, reg_t *argv) { return s->r_acc; } - if (victim_obj->getInfoSelector().offset != SCRIPT_INFO_CLONE) { + if (!victim_obj->isClone()) { //warning("Attempt to dispose something other than a clone at %04x", offset); // SCI silently ignores this behaviour; some games actually depend on it return s->r_acc; |