diff options
author | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
commit | 1bbab8f1915eebdb18365c64ec64eec2a8770bb6 (patch) | |
tree | e7cbeca85155034e77ce1f1bbdbf645982b63182 /engines/sci/engine/scriptdebug.cpp | |
parent | b391f08b46c3f47e8631248fd70ee21ebe12b744 (diff) | |
download | scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.gz scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.bz2 scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.zip |
Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan
svn-id: r43908
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
-rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index ba0570a879..43c07f3419 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -99,7 +99,7 @@ int propertyOffsetToId(SegManager *segManager, int prop_ofs, reg_t objp) { // Disassembles one command from the heap, returns address of next command or 0 if a ret was encountered. reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecode) { - MemObject *mobj = GET_SEGMENT(*s->segmentManager, pos.segment, MEM_OBJ_SCRIPT); + MemObject *mobj = GET_SEGMENT(*s->segMan, pos.segment, MEM_OBJ_SCRIPT); Script *script_entity = NULL; byte *scr; int scr_size; @@ -257,7 +257,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod if ((opcode == op_pTos) || (opcode == op_sTop) || (opcode == op_pToa) || (opcode == op_aTop) || (opcode == op_dpToa) || (opcode == op_ipToa) || (opcode == op_dpTos) || (opcode == op_ipTos)) { int prop_ofs = scr[pos.offset + 1]; - int prop_id = propertyOffsetToId(s->segmentManager, prop_ofs, scriptState.xs->objp); + int prop_id = propertyOffsetToId(s->segMan, prop_ofs, scriptState.xs->objp); printf(" (%s)", selector_name(s, prop_id)); } @@ -269,7 +269,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod if (opcode == op_callk) { int stackframe = (scr[pos.offset + 2] >> 1) + (scriptState.restAdjust); int argc = ((scriptState.xs->sp)[- stackframe - 1]).offset; - bool oldScriptHeader = (s->segmentManager->sciVersion() == SCI_VERSION_0_EARLY); + bool oldScriptHeader = (s->segMan->sciVersion() == SCI_VERSION_0_EARLY); if (!oldScriptHeader) argc += (scriptState.restAdjust); @@ -301,14 +301,14 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod selector = sb[- stackframe].offset; - name = obj_get_name(s->segmentManager, called_obj_addr); + name = obj_get_name(s->segMan, called_obj_addr); if (!name) name = "<invalid>"; printf(" %s::%s[", name, (selector > kernel->getSelectorNamesSize()) ? "<invalid>" : selector_name(s, selector)); - switch (lookup_selector(s->segmentManager, called_obj_addr, selector, 0, &fun_ref)) { + switch (lookup_selector(s->segMan, called_obj_addr, selector, 0, &fun_ref)) { case kSelectorMethod: printf("FUNCT"); argc += restmod; @@ -360,7 +360,7 @@ void script_debug(EngineState *s, bool bp) { #endif if (scriptState.seeking && !bp) { // Are we looking for something special? - MemObject *mobj = GET_SEGMENT(*s->segmentManager, scriptState.xs->addr.pc.segment, MEM_OBJ_SCRIPT); + MemObject *mobj = GET_SEGMENT(*s->segMan, scriptState.xs->addr.pc.segment, MEM_OBJ_SCRIPT); if (mobj) { Script *scr = (Script *)mobj; |