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

[sev-]

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:
eb39be60c2 DIRECTOR: Fix regression where previous frame's tempo is used


Commit: eb39be60c224e2b58fd4f7316a189b04989a99a6
    https://github.com/scummvm/scummvm/commit/eb39be60c224e2b58fd4f7316a189b04989a99a6
Author: Scott Percival (code at moral.net.au)
Date: 2023-07-14T13:26:12+02:00

Commit Message:
DIRECTOR: Fix regression where previous frame's tempo is used

Fixes the 0% warning message in The Cute Machine.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 469b356f537..b52176a23b3 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -443,6 +443,8 @@ void Score::update() {
 		}
 	}
 
+	loadFrame(_curFrameNumber);
+
 	byte tempo = _currentFrame->_scoreCachedTempo;
 	// puppetTempo is overridden by changes in score tempo
 	if (_currentFrame->_tempo || tempo != _lastTempo) {
@@ -522,7 +524,6 @@ void Score::update() {
 			*_currentFrame->_sprites[ch] = *_channels[ch]->_sprite;
 #endif
 
-	loadFrame(_curFrameNumber);
 	// Window is drawn between the prepareFrame and enterFrame events (Lingo in a Nutshell, p.100)
 	renderFrame(_curFrameNumber);
 	_window->_newMovieStarted = false;