[Scummvm-git-logs] scummvm master -> 8a68c0d8919b0fa08a149312867819e1748bb29f

[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:
8a68c0d891 DIRECTOR: Lingo: Fix arguments check for built-ins


Commit: 8a68c0d8919b0fa08a149312867819e1748bb29f
    https://github.com/scummvm/scummvm/commit/8a68c0d8919b0fa08a149312867819e1748bb29f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-07T22:56:30+01:00

Commit Message:
DIRECTOR: Lingo: Fix arguments check for built-ins

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


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index dd59776..c9f9c14 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -895,9 +895,10 @@ void Lingo::call(Common::String name, int nargs) {
 		return;
 	}
 
-	if (sym->nargs != -1 && sym->nargs < nargs) {
-		warning("Incorrect number of arguments for function %s. Dropping extra %d", name.c_str(), nargs - sym->nargs);
-		for (int i = 0; i < nargs - sym->nargs; i++)
+	if (sym->nargs != -1 && sym->maxArgs < nargs) {
+		warning("Incorrect number of arguments for function %s (%d, expected %d to %d). Dropping extra %d",
+					name.c_str(), nargs, sym->nargs, sym->maxArgs, nargs - sym->nargs);
+		for (int i = 0; i < nargs - sym->maxArgs; i++)
 			g_lingo->pop();
 	}