diff options
| author | Max Horn | 2009-10-14 09:37:22 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-14 09:37:22 +0000 |
| commit | 5ea978f63a7835de5ed1c8a6b4af269b27511ba8 (patch) | |
| tree | 1b77d3bea363519fdba70db1f3e39b82e278eeda /engines/sci/engine/seg_manager.cpp | |
| parent | 28034ef29834a8406b69bbf2a665eed061581da1 (diff) | |
| download | scummvm-rg350-5ea978f63a7835de5ed1c8a6b4af269b27511ba8.tar.gz scummvm-rg350-5ea978f63a7835de5ed1c8a6b4af269b27511ba8.tar.bz2 scummvm-rg350-5ea978f63a7835de5ed1c8a6b4af269b27511ba8.zip | |
SCI: Rename some vars (cleaning up what seems to have been caused by a blind global search & replace)
svn-id: r45060
Diffstat (limited to 'engines/sci/engine/seg_manager.cpp')
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 12 |
1 files changed, 6 insertions, 6 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 |