[Scummvm-git-logs] scummvm master -> 492791cf74960751a9e6b7a0b577e3efe6728ef4

[sev-]

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:
cf6655db16 DIRECTOR: Remove bad warning message from test code
492791cf74 DIRECTOR: Fix lingo execution after go to frame


Commit: cf6655db16775c61e3af22a74c57fde3be157d4f
    https://github.com/scummvm/scummvm/commit/cf6655db16775c61e3af22a74c57fde3be157d4f
Author: Harishankar Kumar (hari01584 at gmail.com)
Date: 2023-07-12T22:49:16+02:00

Commit Message:
DIRECTOR: Remove bad warning message from test code

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 94c147c3442..8b902ad129f 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -406,7 +406,6 @@ void Score::update() {
 	if (_curFrameNumber >= getFramesNum()) {
 		Window *window = _vm->getCurrentWindow();
 		if (!window->_movieStack.empty()) {
-			warning("Are we changing movie?");
 			MovieReference ref = window->_movieStack.back();
 			window->_movieStack.pop_back();
 			if (!ref.movie.empty()) {


Commit: 492791cf74960751a9e6b7a0b577e3efe6728ef4
    https://github.com/scummvm/scummvm/commit/492791cf74960751a9e6b7a0b577e3efe6728ef4
Author: Harishankar Kumar (hari01584 at gmail.com)
Date: 2023-07-12T22:49:16+02:00

Commit Message:
DIRECTOR: Fix lingo execution after go to frame

When frame jumping instructions like `go to frame` is used, it should pause
lingo execution before changing frames and then executing remaining lingo code,
This fixes the problem where lingo was executed before the frame was updated.

`ATD\HD\bdDREAMA.DXR` of 'totaldistortion' uses this to set puppetSprite after
calling go to frame.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 8b902ad129f..469b356f537 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -360,7 +360,13 @@ void Score::update() {
 				updateWidgets(true);
 				_window->render();
 			}
-			processFrozenScripts();
+
+			// Don't process frozen script if we use jump instructions
+			// like "go to frame", or open a new movie.
+			if (!_nextFrame || _nextFrame == _curFrameNumber) {
+				processFrozenScripts();
+			}
+
 			return;
 		}
 	}