[Scummvm-git-logs] scummvm master -> 60fdff423165994094ac1133798f97a52f1ceaaa

djsrv noreply at scummvm.org
Fri Jun 17 03:46:34 UTC 2022


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:
60fdff4231 DIRECTOR: LINGO: Replace printSTUBWithArglist with macro printWithArglist


Commit: 60fdff423165994094ac1133798f97a52f1ceaaa
    https://github.com/scummvm/scummvm/commit/60fdff423165994094ac1133798f97a52f1ceaaa
Author: Pragyansh Chaturvedi (r41k0u) (pragyanshchaturvedi18 at gmail.com)
Date: 2022-06-16T22:46:30-05:00

Commit Message:
DIRECTOR: LINGO: Replace printSTUBWithArglist with macro printWithArglist

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


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index e910f5a061e..5c06417e7ad 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -422,7 +422,7 @@ void LC::cb_localcall() {
 	if ((nargs.type == ARGC) || (nargs.type == ARGCNORET)) {
 		Common::String name = g_lingo->_currentScriptContext->_functionNames[functionId];
 		if (debugChannelSet(3, kDebugLingoExec))
-			g_lingo->printSTUBWithArglist(name.c_str(), nargs.u.i, "localcall:");
+			printWithArgList(name.c_str(), nargs.u.i, "localcall:");
 
 		LC::call(name, nargs.u.i, nargs.type == ARGC);
 
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 11160c862c8..bb68a77cc4a 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -1468,7 +1468,7 @@ void LC::c_callfunc() {
 
 void LC::call(const Common::String &name, int nargs, bool allowRetVal) {
 	if (debugChannelSet(3, kDebugLingoExec))
-		g_lingo->printSTUBWithArglist(name.c_str(), nargs, "call:");
+		printWithArgList(name.c_str(), nargs, "call:");
 
 	Symbol funcSym;
 
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index dee395e8eef..8dc32eb1d03 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -56,6 +56,7 @@ class LingoCompiler;
 typedef void (*inst)(void);
 #define	STOP (inst)0
 #define ENTITY_INDEX(t,id) ((t) * 100000 + (id))
+#define printWithArgList g_lingo->printSTUBWithArglist
 
 int calcStringAlignment(const char *s);
 int calcCodeAlignment(int l);




More information about the Scummvm-git-logs mailing list