[Scummvm-git-logs] scummvm master -> 21d06660ccd412b8437f383da01bbeef378d41f2

[moralrecordings]

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

Summary:
022d5035e3 DIRECTOR: Implement b_updateStage
5b0d0a1deb DIRECTOR: kTheMouseCast should return -1 if not overlapping a cast member
21d06660cc DIRECTOR: LINGO: Free memory in cb_proplist


Commit: 022d5035e35e5569951796cda3809a08e59400ef
    https://github.com/scummvm/scummvm/commit/022d5035e35e5569951796cda3809a08e59400ef
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-07T21:04:34+08:00

Commit Message:
DIRECTOR: Implement b_updateStage

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 24d2463fd5..9e6efb37ab 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1902,7 +1902,13 @@ void LB::b_zoomBox(int nargs) {
 }
 
 void LB::b_updateStage(int nargs) {
-	warning("STUB: b_updateStage");
+	ARGNUMCHECK(0);
+
+	Score *score = g_director->getCurrentScore();
+	uint16 curFrame = score->getCurrentFrame();
+	Frame *frame = score->_frames[curFrame];
+
+	frame->prepareFrame(score);
 }
 
 


Commit: 5b0d0a1deba823601cf32b42b381605801efa077
    https://github.com/scummvm/scummvm/commit/5b0d0a1deba823601cf32b42b381605801efa077
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-07T21:04:34+08:00

Commit Message:
DIRECTOR: kTheMouseCast should return -1 if not overlapping a cast member

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


diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index da9efc771a..104991424b 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -416,6 +416,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 			uint16 spriteId = currentFrame->getSpriteIDFromPos(pos);
 			d.type = INT;
 			d.u.i = currentFrame->_sprites[spriteId]->_castId;
+			if (d.u.i == 0)
+				d.u.i = -1;
 		}
 		break;
 	case kThePerFrameHook:


Commit: 21d06660ccd412b8437f383da01bbeef378d41f2
    https://github.com/scummvm/scummvm/commit/21d06660ccd412b8437f383da01bbeef378d41f2
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-07T21:04:35+08:00

Commit Message:
DIRECTOR: LINGO: Free memory in cb_proplist

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 e98198a014..b54306830f 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -369,6 +369,9 @@ void LC::cb_proplist() {
 		PCell cell = PCell(p, v);
 		result.u.parr->insert_at(0, cell);
 	};
+	delete list.u.farr;
+	list.u.i = 0;
+	list.type = VOID;
 
 	g_lingo->push(result);
 }