[Scummvm-git-logs] scummvm master -> 6ab8a0a4dba66d472e33adda586e9a61f19141f2

[djsrv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ce4aa63781 DIRECTOR: Fix where initial call stack size is recorded
6ab8a0a4db DIRECTOR: LINGO: Fix tellcall arg type


Commit: ce4aa637818f01523cc0d2155f344938a764bd1f
    https://github.com/scummvm/scummvm/commit/ce4aa637818f01523cc0d2155f344938a764bd1f
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-21T19:04:54-04:00

Commit Message:
DIRECTOR: Fix where initial call stack size is recorded

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 3273cc2a7b..fcd2563a02 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -308,8 +308,6 @@ void Score::stopPlay() {
 }
 
 void Score::update() {
-	uint initialCallStackSize = g_lingo->_callstack.size();
-
 	if (_activeFade) {
 		if (!_soundManager->fadeChannel(_activeFade))
 			_activeFade = 0;
@@ -405,6 +403,8 @@ void Score::update() {
 
 	debugC(1, kDebugImages, "******************************  Current frame: %d", _currentFrame);
 
+	uint initialCallStackSize = g_lingo->_callstack.size();
+
 	_lingo->executeImmediateScripts(_frames[_currentFrame]);
 
 	if (_vm->getVersion() >= 600) {


Commit: 6ab8a0a4dba66d472e33adda586e9a61f19141f2
    https://github.com/scummvm/scummvm/commit/6ab8a0a4dba66d472e33adda586e9a61f19141f2
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-21T19:12:17-04:00

Commit Message:
DIRECTOR: LINGO: Fix tellcall arg type

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


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index f4e9cdff4c..4ebaee00d2 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -102,7 +102,7 @@ static LingoV4Bytecode lingoV4[] = {
 	{ 0x60, LC::cb_theassign2,	"bN" },
 	{ 0x61, LC::cb_objectfieldpush, "bN" },
 	{ 0x62, LC::cb_objectfieldassign, "bN" },
-	{ 0x63, LC::cb_call,		"b" }, // tellcall
+	{ 0x63, LC::cb_call,		"bN" }, // tellcall
 	{ 0x64, LC::c_stackpeek, 	"b" },
 	{ 0x65, LC::c_stackdrop, 	"b" },
 	{ 0x66, LC::cb_v4theentitynamepush, "bN" },