aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/console.cpp
diff options
context:
space:
mode:
authorColin Snover2017-07-22 12:20:46 -0500
committerColin Snover2017-07-23 10:35:13 -0500
commit8bab5a3467519fdfd8509b8250d12a97e4a2e02e (patch)
tree288c382d5391ee2b7dd49e62fd836d2ab97ec724 /engines/sci/console.cpp
parent5b166a517303b076478f21b108e1109b07e1a322 (diff)
downloadscummvm-rg350-8bab5a3467519fdfd8509b8250d12a97e4a2e02e.tar.gz
scummvm-rg350-8bab5a3467519fdfd8509b8250d12a97e4a2e02e.tar.bz2
scummvm-rg350-8bab5a3467519fdfd8509b8250d12a97e4a2e02e.zip
SCI: Resolve offset names when disassembling object methods
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r--engines/sci/console.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index bfa9f45d5b..82661f044b 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3402,7 +3402,7 @@ bool Console::cmdDisassemble(int argc, const char **argv) {
farthestTarget = jumpTarget;
}
// TODO: Use a true 32-bit reg_t for the position (addr)
- addr = disassemble(_engine->_gamestate, make_reg32(addr.getSegment(), addr.getOffset()), objAddr, printBWTag, printBytecode);
+ addr = disassemble(_engine->_gamestate, make_reg32(addr.getSegment(), addr.getOffset()), obj, printBWTag, printBytecode);
if (addr.isNull() && prevAddr < farthestTarget)
addr = prevAddr + 1; // skip past the ret
} while (addr.getOffset() > 0);
@@ -3451,7 +3451,7 @@ bool Console::cmdDisassembleAddress(int argc, const char **argv) {
do {
// TODO: Use a true 32-bit reg_t for the position (vpc)
- vpc = disassemble(_engine->_gamestate, make_reg32(vpc.getSegment(), vpc.getOffset()), NULL_REG, printBWTag, printBytes);
+ vpc = disassemble(_engine->_gamestate, make_reg32(vpc.getSegment(), vpc.getOffset()), nullptr, printBWTag, printBytes);
} while ((vpc.getOffset() > 0) && (vpc.getOffset() + 6 < size) && (--opCount));
return true;