diff options
| author | Max Horn | 2009-09-21 21:35:43 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-21 21:35:43 +0000 |
| commit | 57dfb9bafd9eda6776ebfa1e2a5453f6fcfaf3ab (patch) | |
| tree | 4e8865ee59dd9ec328e987b23af1b8bd6c15e5e9 /engines/sci/engine/kscripts.cpp | |
| parent | 47e677ffccd422f63a414a9e5dc8c00b05547a2e (diff) | |
| download | scummvm-rg350-57dfb9bafd9eda6776ebfa1e2a5453f6fcfaf3ab.tar.gz scummvm-rg350-57dfb9bafd9eda6776ebfa1e2a5453f6fcfaf3ab.tar.bz2 scummvm-rg350-57dfb9bafd9eda6776ebfa1e2a5453f6fcfaf3ab.zip | |
SCI: Rename Object::flags and pos to _flags and _pos; tweak scriptObjInit0 and scriptObjInit11 to be more similar
svn-id: r44234
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 2978a2a2e2..f9ec052d0f 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -123,15 +123,15 @@ reg_t kClone(EngineState *s, int, int argc, reg_t *argv) { } *clone_obj = *parent_obj; - clone_obj->flags = 0; + clone_obj->_flags = 0; // Mark as clone clone_obj->setInfoSelector(make_reg(0, SCRIPT_INFO_CLONE)); - clone_obj->setSpeciesSelector(clone_obj->pos); + clone_obj->setSpeciesSelector(clone_obj->_pos); if (parent_obj->isClass()) - clone_obj->setSuperClassSelector(parent_obj->pos); - s->segMan->getScript(parent_obj->pos.segment)->incrementLockers(); - s->segMan->getScript(clone_obj->pos.segment)->incrementLockers(); + clone_obj->setSuperClassSelector(parent_obj->_pos); + s->segMan->getScript(parent_obj->_pos.segment)->incrementLockers(); + s->segMan->getScript(clone_obj->_pos.segment)->incrementLockers(); return clone_addr; } @@ -169,7 +169,7 @@ reg_t kDisposeClone(EngineState *s, int, int argc, reg_t *argv) { } #endif - victim_obj->flags |= OBJECT_FLAG_FREED; + victim_obj->_flags |= OBJECT_FLAG_FREED; _k_view_list_mark_free(s, victim_addr); // Free on view list, if neccessary |