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

[moralrecordings]

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:
b4737f21ce DIRECTOR: Fix regression with tempo selection


Commit: b4737f21ce75bd7e6008fe5924e73ef420125dfb
    https://github.com/scummvm/scummvm/commit/b4737f21ce75bd7e6008fe5924e73ef420125dfb
Author: Scott Percival (code at moral.net.au)
Date: 2024-02-01T00:23:19+08:00

Commit Message:
DIRECTOR: Fix regression with tempo selection

Restores all of the alternative "wait for" types of tempo instruction.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 1c9919fe8c3..5db7124993b 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -427,7 +427,7 @@ void Score::updateCurrentFrame() {
 }
 
 void Score::updateNextFrameTime() {
-	byte tempo = _currentFrame->_mainChannels.scoreCachedTempo;
+	byte tempo = _currentFrame->_mainChannels.tempo ? _currentFrame->_mainChannels.tempo : _currentFrame->_mainChannels.scoreCachedTempo;
 	// puppetTempo is overridden by changes in score tempo
 	if (_currentFrame->_mainChannels.tempo || tempo != _lastTempo) {
 		_puppetTempo = 0;