[Scummvm-git-logs] scummvm master -> 9b6635b66a44b162a5caaae9dbed176189c9bff1

[djsrv]

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:
9b6635b66a DIRECTOR: LINGO: Don't warn about missing mNew return val


Commit: 9b6635b66a44b162a5caaae9dbed176189c9bff1
    https://github.com/scummvm/scummvm/commit/9b6635b66a44b162a5caaae9dbed176189c9bff1
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-11T13:37:41-04:00

Commit Message:
DIRECTOR: LINGO: Don't warn about missing mNew return val

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 e51b2a508d..545e9c1f66 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -331,7 +331,11 @@ void Lingo::popContext(bool aborting) {
 		}
 	} else if (_stack.size() == fp->stackSizeBefore) {
 		if (fp->allowRetVal) {
-			warning("handler %s did not return value", fp->sp.name->c_str());
+			// Don't warn about missing return value if there's an explicit, non-VOID default,
+			// e.g. for factories' mNew method.
+			if (fp->defaultRetVal.type == VOID) {
+				warning("handler %s did not return value", fp->sp.name->c_str());
+			}
 			g_lingo->push(fp->defaultRetVal);
 		}
 	} else if (_stack.size() > fp->stackSizeBefore) {