aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/scriptdebug.cpp
diff options
context:
space:
mode:
authorMax Horn2009-10-04 18:38:18 +0000
committerMax Horn2009-10-04 18:38:18 +0000
commit6ad5840181557a42be4812984fb38d3f47c3e66a (patch)
treeba4ab9536c38b67d1dbb53707c76e733558cb196 /engines/sci/engine/scriptdebug.cpp
parent0da9ad5ff59e910c91becf1ba62ee5e864d25c32 (diff)
downloadscummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.tar.gz
scummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.tar.bz2
scummvm-rg350-6ad5840181557a42be4812984fb38d3f47c3e66a.zip
SCI: Rename EngineState::segMan to _segMan
svn-id: r44629
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
-rw-r--r--engines/sci/engine/scriptdebug.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 7ddec73f19..e6b5c56899 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -98,7 +98,7 @@ int propertyOffsetToId(SegManager *segMan, 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) {
- SegmentObj *mobj = GET_SEGMENT(*s->segMan, pos.segment, SEG_TYPE_SCRIPT);
+ SegmentObj *mobj = GET_SEGMENT(*s->_segMan, pos.segment, SEG_TYPE_SCRIPT);
Script *script_entity = NULL;
byte *scr;
int scr_size;
@@ -256,7 +256,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->segMan, prop_ofs, scriptState.xs->objp);
+ int prop_id = propertyOffsetToId(s->_segMan, prop_ofs, scriptState.xs->objp);
printf(" (%s)", selector_name(s, prop_id));
}
@@ -300,14 +300,14 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
selector = sb[- stackframe].offset;
- name = s->segMan->getObjectName(called_obj_addr);
+ name = s->_segMan->getObjectName(called_obj_addr);
if (!name)
name = "<invalid>";
printf(" %s::%s[", name, (selector > kernel->getSelectorNamesSize()) ? "<invalid>" : selector_name(s, selector));
- switch (lookup_selector(s->segMan, 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;
@@ -359,7 +359,7 @@ void script_debug(EngineState *s, bool bp) {
#endif
if (g_debugState.seeking && !bp) { // Are we looking for something special?
- SegmentObj *mobj = GET_SEGMENT(*s->segMan, scriptState.xs->addr.pc.segment, SEG_TYPE_SCRIPT);
+ SegmentObj *mobj = GET_SEGMENT(*s->_segMan, scriptState.xs->addr.pc.segment, SEG_TYPE_SCRIPT);
if (mobj) {
Script *scr = (Script *)mobj;