diff options
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 12 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index dd635d2146..3cb4a5d0f1 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -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 diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index f534a1945d..c70fbbb764 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -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)); |