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

SCI: Rename some vars (cleaning up what seems to have been caused by a blind global search & replace)

Browse source 
svn-id: r45060
This commit is contained in:
Max Horn 2009-10-14 09:37:22 +00:00
parent 28034ef298
commit 5ea978f63a
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -660,9 +660,9 @@ void SegManager::scriptInitialiseObjectsSci11(SegmentId seg) {
#if 0
if (obj->_variables[5].offset != 0xffff) {
obj->_variables[5] = INST_LOOKUP_CLASS(obj->_variables[5].offset);
_baseObj = getObject(obj->_variables[5]);
obj->variable_names_nr = _baseObj->variables_nr;
obj->_baseObj = _baseObj->_baseObj;
baseObj = getObject(obj->_variables[5]);
obj->variable_names_nr = baseObj->variables_nr;
obj->_baseObj = baseObj->_baseObj;
}
#endif
@ -796,9 +796,9 @@ void SegManager::reconstructClones() {
continue;
CloneTable::Entry &seeker = ct->_table[j];
Object *_baseObj = getObject(seeker.getSpeciesSelector());
seeker.cloneFromObject(_baseObj);
if (!_baseObj)
Object *baseObj = getObject(seeker.getSpeciesSelector());
seeker.cloneFromObject(baseObj);
if (!baseObj)
warning("Clone entry without a base class: %d", j);
} // end for
} // end if

6
engines/sci/engine/vm.cpp
View file

@ -1597,9 +1597,9 @@ int script_instantiate_sci0(ResourceManager *resMan, SegManager *segMan, int scr
// Instantiate the superclass, if neccessary
obj->setSpeciesSelector(INST_LOOKUP_CLASS(obj->getSpeciesSelector().offset));
Object *_baseObj = segMan->getObject(obj->getSpeciesSelector());
obj->setVarCount(_baseObj->getVarCount());
obj->_baseObj = _baseObj->_baseObj;
Object *baseObj = segMan->getObject(obj->getSpeciesSelector());
obj->setVarCount(baseObj->getVarCount());
obj->_baseObj = baseObj->_baseObj;
// Copy base from species class, as we need its selector IDs
obj->setSuperClassSelector(INST_LOOKUP_CLASS(obj->getSuperClassSelector().offset));