[Scummvm-git-logs] scummvm master -> 6744b550ab1b7cdbf27571e474ed4e85f7fca7b5

[npjg]

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:
de9585cfbd DIRECTOR: Fix improper limitation on puppetTempo values
6744b550ab DIRECTOR: Reset puppetTempo on next score tempo change


Commit: de9585cfbd3492b3cc39ef5b7d2e53705c480afc
    https://github.com/scummvm/scummvm/commit/de9585cfbd3492b3cc39ef5b7d2e53705c480afc
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-06T11:55:45-04:00

Commit Message:
DIRECTOR: Fix improper limitation on puppetTempo values

Values greater than this are used for special functionalities, like wait for click.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index b9ae0fb6d4..c2a6e5881c 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1742,8 +1742,7 @@ void LB::b_puppetSprite(int nargs) {
 }
 
 void LB::b_puppetTempo(int nargs) {
-	// TODO: Check if >D4 permitted tempo higher than 60.
-	g_director->getCurrentMovie()->getScore()->_puppetTempo = MIN(g_lingo->pop().asInt(), 60);
+	g_director->getCurrentMovie()->getScore()->_puppetTempo = g_lingo->pop().asInt();
 }
 
 void LB::b_puppetTransition(int nargs) {


Commit: 6744b550ab1b7cdbf27571e474ed4e85f7fca7b5
    https://github.com/scummvm/scummvm/commit/6744b550ab1b7cdbf27571e474ed4e85f7fca7b5
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-06T11:56:27-04:00

Commit Message:
DIRECTOR: Reset puppetTempo on next score tempo change

Lingo Dictionary, 229.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index ef27ca129b..3a980f611c 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -525,7 +525,12 @@ void Score::update() {
 	}
 	// TODO Director 6 - another order
 
-	byte tempo = _puppetTempo ? _puppetTempo : _frames[_currentFrame]->_tempo;
+	byte tempo = _frames[_currentFrame]->_tempo;
+	if (tempo) {
+		_puppetTempo = 0;
+	} else if (_puppetTempo) {
+		tempo = _puppetTempo;
+	}
 
 	if (tempo) {
 		if (tempo > 161) {