From 14907039fe092e0ee5ac8176480ca08803cd82c2 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Tue, 25 Jul 2017 11:44:55 -0500 Subject: SCI32: Fix lofsa/lofss of strings in SCI3 disassembly --- engines/sci/engine/scriptdebug.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'engines/sci/engine/scriptdebug.cpp') diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index 545aae6d30..1b3f18694e 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -271,7 +271,11 @@ reg_t disassemble(EngineState *s, reg32_t pos, const Object *obj, bool printBWTa reg_t addr; addr.setSegment(retval.getSegment()); addr.setOffset(offset); - debugN("\t%s", s->_segMan->getObjectName(addr)); + if (getSciVersion() == SCI_VERSION_3 && !s->_segMan->isObject(addr)) { + debugN("\t\"%s\"", s->_segMan->derefString(addr)); + } else { + debugN("\t%s", s->_segMan->getObjectName(addr)); + } debugN(opsize ? "[%02x]" : "[%04x]", offset); break; } -- cgit v1.2.3