DIRECTOR: Lingo: Support string Datum printing

scummvm · Aug 3, 2016 · 598be95 · 598be95
1 parent 4763228
commit 598be95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
@@ -127,7 +127,8 @@ Common::Error DirectorEngine::run() {
 		if x = 4 then put 4\n\
 		else put 5\n\
 	end repeat\n\
-	set z = \"foo\"\n\
+	set z = \"foo bar baz\"\n\
+	put z\n\
 ", kMovieScript, 2);
 
 _lingo->executeScript(kMovieScript, 2);

diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
@@ -92,6 +92,9 @@ void Lingo::c_printtop(void) {
 				warning("Nameless var. val: %d", d.u.sym->u.val);
 		}
 		break;
+	case STRING:
+		warning("%s", d.u.s->c_str());
+		break;
 	default:
 		warning("--unknown--");
 	}
@@ -169,7 +172,7 @@ void Lingo::c_assign() {
 }
 
 bool Lingo::verify(Symbol *s) {
-	if (s->type != INT && s->type != VOID && s->type != FLOAT) {
+	if (s->type != INT && s->type != VOID && s->type != FLOAT && s->type != STRING) {
 		warning("attempt to evaluate non-variable '%s'", s->name);
 
 		return false;