[Scummvm-git-logs] scummvm master -> 89c4a1c7e1c9cc59cc45ea74c339cd4aa21cbdc9

[sev-]

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:
89c4a1c7e1 DIRECTOR: LINGO: Do not try to evaluate non-strings in 'value' command


Commit: 89c4a1c7e1c9cc59cc45ea74c339cd4aa21cbdc9
    https://github.com/scummvm/scummvm/commit/89c4a1c7e1c9cc59cc45ea74c339cd4aa21cbdc9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-06-23T00:54:04+02:00

Commit Message:
DIRECTOR: LINGO: Do not try to evaluate non-strings in 'value' command

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index a20c5d6fb64..757df170214 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -521,6 +521,11 @@ void LB::b_string(int nargs) {
 
 void LB::b_value(int nargs) {
 	Datum d = g_lingo->pop();
+	if (d.type != STRING) {
+		g_lingo->push(d);
+		return;
+	}
+
 	Common::String expr = d.asString();
 	if (expr.empty()) {
 		g_lingo->push(Datum(0));
@@ -2074,7 +2079,7 @@ void LB::b_pasteClipBoardInto(int nargs) {
 	}
 
 	Movie *movie = g_director->getCurrentMovie();
-	uint16 frame = movie->getScore()->getCurrentFrame(); 
+	uint16 frame = movie->getScore()->getCurrentFrame();
 	Frame *currentFrame = movie->getScore()->_frames[frame];
 	CastMember *castMember = movie->getCastMember(*g_director->_clipBoard);
 	auto channels = movie->getScore()->_channels;