aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/scriptdebug.cpp
diff options
context:
space:
mode:
authorColin Snover2017-07-25 11:44:55 -0500
committerColin Snover2017-07-26 22:02:37 -0500
commit14907039fe092e0ee5ac8176480ca08803cd82c2 (patch)
tree0280514b9c0f198ffc9742f65384163995a08a41 /engines/sci/engine/scriptdebug.cpp
parent3382a32cd8c62c99c24526df56e5aeda3a3976f0 (diff)
downloadscummvm-rg350-14907039fe092e0ee5ac8176480ca08803cd82c2.tar.gz
scummvm-rg350-14907039fe092e0ee5ac8176480ca08803cd82c2.tar.bz2
scummvm-rg350-14907039fe092e0ee5ac8176480ca08803cd82c2.zip
SCI32: Fix lofsa/lofss of strings in SCI3 disassembly
Diffstat (limited to 'engines/sci/engine/scriptdebug.cpp')
-rw-r--r--engines/sci/engine/scriptdebug.cpp6
1 files changed, 5 insertions, 1 deletions
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;
}