[Scummvm-cvs-logs] SF.net SVN: scummvm:[45060] scummvm/trunk/engines/sci/engine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Oct 14 11:37:22 CEST 2009
Revision: 45060
http://scummvm.svn.sourceforge.net/scummvm/?rev=45060&view=rev
Author: fingolfin
Date: 2009-10-14 09:37:22 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
SCI: Rename some vars (cleaning up what seems to have been caused by a blind global search & replace)
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/seg_manager.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-10-14 09:36:39 UTC (rev 45059)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-10-14 09:37:22 UTC (rev 45060)
@@ -660,9 +660,9 @@
#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 @@
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
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-10-14 09:36:39 UTC (rev 45059)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-10-14 09:37:22 UTC (rev 45060)
@@ -1597,9 +1597,9 @@
// 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));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list