[Scummvm-git-logs] scummvm master -> 1b2ce997b103688b42b049158ecb8d1837cf215c

[rvanlaar]

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:
1b2ce997b1 DIRECTOR: LINGO: implement frameScript property


Commit: 1b2ce997b103688b42b049158ecb8d1837cf215c
    https://github.com/scummvm/scummvm/commit/1b2ce997b103688b42b049158ecb8d1837cf215c
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-11T22:39:01+01:00

Commit Message:
DIRECTOR: LINGO: implement frameScript property

The frameScript property returns the cast number of the script in the
scipt channel.

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 7620c3dd2ae..eaddc8964a0 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -26,6 +26,7 @@
 #include "director/castmember.h"
 #include "director/cursor.h"
 #include "director/channel.h"
+#include "director/frame.h"
 #include "director/movie.h"
 #include "director/sound.h"
 #include "director/sprite.h"
@@ -463,7 +464,8 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		d.u.s = score->getFrameLabel(score->getCurrentFrame());
 		break;
 	case kTheFrameScript:
-		getTheEntitySTUB(kTheFrameScript);
+		d.type = INT;
+		d.u.i = score->_frames[score->getCurrentFrame()]->_actionId.member;
 		break;
 	case kTheFramePalette:
 		d.type = INT;
@@ -971,7 +973,7 @@ void Lingo::setTheEntity(int entity, Datum &id, int field, Datum &d) {
 		setTheEntityReadOnly(kTheFrameLabel);
 		break;
 	case kTheFrameScript:
-		setTheEntitySTUB(kTheFrameScript);
+		setTheEntityReadOnly(kTheFrameScript);
 		break;
 	case kTheFramePalette:
 		setTheEntityReadOnly(kTheFramePalette);