aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-11-24 00:22:17 +0100
committerEugene Sandulenko2019-11-24 00:22:17 +0100
commit735db39ad93b9865c0c4486299c2fd50022344f7 (patch)
treee0bc01bc1bf26029ab5019c91351d413c62c90ad
parentc5bca8734fe2a373e9439d7a41b291de55e0fb5c (diff)
downloadscummvm-rg350-735db39ad93b9865c0c4486299c2fd50022344f7.tar.gz
scummvm-rg350-735db39ad93b9865c0c4486299c2fd50022344f7.tar.bz2
scummvm-rg350-735db39ad93b9865c0c4486299c2fd50022344f7.zip
DIRECTOR: Fix symbol printing
-rw-r--r--engines/director/lingo/lingo-builtins.cpp2
-rw-r--r--engines/director/lingo/lingo.cpp29
2 files changed, 30 insertions, 1 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 872008ed2e..95b83e945a 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -383,7 +383,7 @@ void Lingo::printSTUBWithArglist(const char *funcname, int nargs, const char *pr
s += ")";
- warning("%s %s", prefix, s.c_str());
+ debug(5, "%s %s", prefix, s.c_str());
}
void Lingo::convertVOIDtoString(int arg, int nargs) {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 9864fc860c..761cf74137 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -325,6 +325,35 @@ Common::String *Datum::toString() {
s = u.s;
break;
case SYMBOL:
+ switch (u.i) {
+ case INT:
+ *s = "#integer";
+ break;
+ case FLOAT:
+ *s = "#float";
+ break;
+ case STRING:
+ *s = "#string";
+ break;
+ case SYMBOL:
+ *s = "#symbol";
+ break;
+ case OBJECT:
+ *s = "#object";
+ break;
+ case VOID:
+ *s = "#void";
+ break;
+ case VAR:
+ *s = "#scumm-var";
+ break;
+ case REFERENCE:
+ *s = "#scumm-ref";
+ break;
+ default:
+ *s = Common::String::format("#unknown%d", u.i);
+ }
+ break;
case OBJECT:
*s = Common::String::format("#%s", u.s->c_str());
break;