[Scummvm-git-logs] scummvm master -> c20dc805c519718babef3d0b236f669f6cf694aa

[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:
c20dc805c5 DIRECTOR: LINGO: Fix the stage keywords


Commit: c20dc805c519718babef3d0b236f669f6cf694aa
    https://github.com/scummvm/scummvm/commit/c20dc805c519718babef3d0b236f669f6cf694aa
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-02-21T18:56:40+01:00

Commit Message:
DIRECTOR: LINGO: Fix the stage keywords

Set the stage's coordinates, i.e.  top and left to 0, bottom and right
to the surface's height and width.

The stage coordinates, stageLeft, stageRight, stageTop and stageBottom
give the position of the stage with respect to the upper left of the
monitor (0,0).
In ScummVMs case we don't display outside the window and default to the
current window.

For more information see page 160 of the Director 3.1 Interactivity
Manual.

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 41f23ca27d2..961baeac926 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -814,22 +814,22 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
 		break;
 	case kTheStageBottom:
 		d.type = INT;
-		d.u.i = movie->_movieRect.bottom;
+		d.u.i = _vm->getCurrentWindow()->getSurface()->h;
 		break;
 	case kTheStageColor:
 		getTheEntitySTUB(kTheStageColor);
 		break;
 	case kTheStageLeft:
 		d.type = INT;
-		d.u.i = movie->_movieRect.left;
+		d.u.i = 0;
 		break;
 	case kTheStageRight:
 		d.type = INT;
-		d.u.i = movie->_movieRect.right;
+		d.u.i = _vm->getCurrentWindow()->getSurface()->w;
 		break;
 	case kTheStageTop:
 		d.type = INT;
-		d.u.i = movie->_movieRect.top;
+		d.u.i = 0;
 		break;
 	case kTheStillDown:
 		d.type = INT;