diff options
| author | Filippos Karapetis | 2009-09-12 00:10:07 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-12 00:10:07 +0000 |
| commit | 90ae20c3eaaa173a8e7f799b678d835b23df6414 (patch) | |
| tree | 02c831b25aaaab2e8fdb3606c8d3bae539719510 /engines/sci/engine/scriptdebug.cpp | |
| parent | 5c2f872ba4920406bc526e4e48a9d6271ef18aee (diff) | |
| download | scummvm-rg350-90ae20c3eaaa173a8e7f799b678d835b23df6414.tar.gz scummvm-rg350-90ae20c3eaaa173a8e7f799b678d835b23df6414.tar.bz2 scummvm-rg350-90ae20c3eaaa173a8e7f799b678d835b23df6414.zip | |
- Made obj_get and obj_get_name methods of SegManager (getObject and getObjectName, respectively)
- Renamed alloc_List -> allocateList, alloc_Node->allocateNode, alloc_hunk_entry->allocateHunkEntry, free_hunk_entry->freeHunkEntry, for consistency
svn-id: r44039
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index ffad720c86..92a8f36fc5 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -66,7 +66,7 @@ extern const char *selector_name(EngineState *s, int selector); ScriptState scriptState; int propertyOffsetToId(SegManager *segMan, int prop_ofs, reg_t objp) { - Object *obj = obj_get(segMan, objp); + Object *obj = segMan->getObject(objp); byte *selectoroffset; int selectors; SciVersion version = segMan->sciVersion(); // for the selector defines @@ -82,7 +82,7 @@ int propertyOffsetToId(SegManager *segMan, int prop_ofs, reg_t objp) { selectoroffset = ((byte *)(obj->base_obj)) + SCRIPT_SELECTOR_OFFSET + selectors * 2; else { if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS)) { - obj = obj_get(segMan, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]); + obj = segMan->getObject(obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]); selectoroffset = (byte *)obj->base_vars; } else selectoroffset = (byte *)obj->base_vars; @@ -301,7 +301,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod selector = sb[- stackframe].offset; - name = obj_get_name(s->segMan, called_obj_addr); + name = s->segMan->getObjectName(called_obj_addr); if (!name) name = "<invalid>"; |