[Scummvm-git-logs] scummvm master -> f9ce4e805a984279f2cbed674b272bb31c0276f2

[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:
f9ce4e805a DIRECTOR: LINGO: Make scummvmAssert() treat any non-zero value as true


Commit: f9ce4e805a984279f2cbed674b272bb31c0276f2
    https://github.com/scummvm/scummvm/commit/f9ce4e805a984279f2cbed674b272bb31c0276f2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-30T15:57:34+02:00

Commit Message:
DIRECTOR: LINGO: Make scummvmAssert() treat any non-zero value as true

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 63c6bae811..2222d22102 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -256,7 +256,7 @@ static struct BuiltinProto {
 	{ "lastLineOf",		LB::b_lastlineof,	1, 1, false, 4, FBLTIN },	//			D4 f
 	{ "lastWordOf",		LB::b_lastwordof,	1, 1, false, 4, FBLTIN },	//			D4 f
 
-	//scummVM Asserts: Used for testing scummvm's lingo implementation
+	// ScummVM Asserts: Used for testing ScummVM's Lingo implementation
 	{ "scummvmAssert",	LB::b_scummvmassert,1, 1, true,  2, FBLTIN },
 	{ "scummvmAssertEqual",	LB::b_scummvmassertequal,2,2,true,2,FBLTIN },
 
@@ -2297,10 +2297,10 @@ void LB::b_lastwordof(int nargs) {
 void LB::b_scummvmassert(int nargs) {
 	Datum d = g_lingo->pop();
 
-	if (d.asInt() != 1) {
+	if (d.asInt() == 0) {
 		warning("LB::b_scummvmassert: is false");
 	}
-	assert(d.asInt() == 1);
+	assert(d.asInt() != 0);
 	g_lingo->push(d);
 }