diff options
| author | Max Horn | 2009-09-06 12:57:42 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-06 12:57:42 +0000 |
| commit | d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3 (patch) | |
| tree | 6dd83b676d66a3653e3d8d684f95175e363acae1 /engines/sci/engine/scriptdebug.cpp | |
| parent | c0ff500b0a1a1595f2f88583c925758039e9b64c (diff) | |
| download | scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.gz scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.bz2 scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.zip | |
SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 43c07f3419..ffad720c86 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -65,11 +65,11 @@ extern const char *selector_name(EngineState *s, int selector); ScriptState scriptState; -int propertyOffsetToId(SegManager *segManager, int prop_ofs, reg_t objp) { - Object *obj = obj_get(segManager, objp); +int propertyOffsetToId(SegManager *segMan, int prop_ofs, reg_t objp) { + Object *obj = obj_get(segMan, objp); byte *selectoroffset; int selectors; - SciVersion version = segManager->sciVersion(); // for the selector defines + SciVersion version = segMan->sciVersion(); // for the selector defines if (!obj) { warning("Applied propertyOffsetToId on non-object at %04x:%04x", PRINT_REG(objp)); @@ -78,11 +78,11 @@ int propertyOffsetToId(SegManager *segManager, int prop_ofs, reg_t objp) { selectors = obj->_variables.size(); - if (segManager->sciVersion() < SCI_VERSION_1_1) + if (segMan->sciVersion() < SCI_VERSION_1_1) selectoroffset = ((byte *)(obj->base_obj)) + SCRIPT_SELECTOR_OFFSET + selectors * 2; else { if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS)) { - obj = obj_get(segManager, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]); + obj = obj_get(segMan, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]); selectoroffset = (byte *)obj->base_vars; } else selectoroffset = (byte *)obj->base_vars; |