[Scummvm-git-logs] scummvm master -> 372a7f984feeee9834bfe44fe3a5162a888b88aa

[rvanlaar]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
372a7f984f DIRECTOR: LINGO: Only replace string that is a var


Commit: 372a7f984feeee9834bfe44fe3a5162a888b88aa
    https://github.com/scummvm/scummvm/commit/372a7f984feeee9834bfe44fe3a5162a888b88aa
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-07-26T23:35:01+02:00

Commit Message:
DIRECTOR: LINGO: Only replace string that is a var

cb_objectcall accepts strings that should be variables.
When a string isn't known as a variable it should be popped
back to the stack as a string.
The check was for VOIDSYM, however a non-existing var results in
a VOID.

Changed paths:
    engines/director/lingo/lingo-bytecode.cpp


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 1945b5cfb8..c8ce021c8b 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -406,7 +406,7 @@ void LC::cb_objectcall() {
 			Datum varTest(arg);
 			varTest.type = VAR;
 			varTest = g_lingo->varFetch(varTest);
-			if (varTest.type != VOIDSYM)
+			if (varTest.type != VOID)
 				arg = varTest;
 		}
 		args.push_back(arg);