thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Rename Object::flags and pos to _flags and _pos; tweak scriptObjInit0 and scriptObjInit11 to be more similar

Browse source 
svn-id: r44234
This commit is contained in:
Max Horn 2009-09-21 21:35:43 +00:00
parent 47e677ffcc
commit 57dfb9bafd
7 changed files with 58 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/engine/kscripts.cpp
View file

@ -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