diff options
| author | Colin Snover | 2017-09-30 00:03:17 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-30 01:08:12 -0500 |
| commit | be37a62591af98c379fd5f92fcab31b70a65ac6d (patch) | |
| tree | 015c523ec23af31ee63a7d47ed537858b9eb3e3c /engines | |
| parent | b2966f3fc8b7bbf429373d9988ea1280660dc33b (diff) | |
| download | scummvm-rg350-be37a62591af98c379fd5f92fcab31b70a65ac6d.tar.gz scummvm-rg350-be37a62591af98c379fd5f92fcab31b70a65ac6d.tar.bz2 scummvm-rg350-be37a62591af98c379fd5f92fcab31b70a65ac6d.zip | |
SCI: Fix printing of super calls on clones in debugger
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index d46b630292..bae1fb4757 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -191,7 +191,7 @@ reg_t disassemble(EngineState *s, reg32_t pos, const Object *obj, bool printBWTa debugN("\t%s[%x],", (param_value < kernel->_kernelFuncs.size()) ? ((param_value < kernel->getKernelNamesSize()) ? kernel->getKernelName(param_value).c_str() : "[Unknown(postulated)]") : "<invalid>", param_value); - } else if (opcode == op_class) { + } else if (opcode == op_class || opcode == op_super) { const reg_t classAddr = s->_segMan->getClassAddress(param_value, SCRIPT_GET_DONT_LOAD, retval.getSegment()); if (!classAddr.isNull()) { debugN("\t%s", s->_segMan->getObjectName(classAddr)); @@ -199,15 +199,8 @@ reg_t disassemble(EngineState *s, reg32_t pos, const Object *obj, bool printBWTa } else { debugN(opsize ? "\t%02x" : "\t%04x", param_value); } - } else if (opcode == op_super) { - if (obj != nullptr) { - debugN("\t%s", s->_segMan->getObjectName(obj->getSuperClassSelector())); - debugN(opsize ? "[%02x]" : "[%04x]", param_value); - } else { - debugN(opsize ? "\t%02x" : "\t%04x", param_value); - } - debugN(","); + debugN(", "); #ifdef ENABLE_SCI32 } else if ( opcode == op_pToa || opcode == op_aTop || |