[Scummvm-git-logs] scummvm master -> 65b43f1c570932a22d80f7cafd358ce8528bc51c

djsrv dservilla at gmail.com
Thu Aug 5 20:49:17 UTC 2021


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:
8b2d369fe4 DIRECTOR: Fix max FPS
65b43f1c57 DIRECTOR: Improve tempo stub


Commit: 8b2d369fe47d285677817488bf4174a5d4b80b3e
    https://github.com/scummvm/scummvm/commit/8b2d369fe47d285677817488bf4174a5d4b80b3e
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-05T16:48:39-04:00

Commit Message:
DIRECTOR: Fix max FPS

The slider goes up to 120.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index d69b9c9184..f3ab782672 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -455,7 +455,7 @@ void Score::update() {
 		if (tempo > 161) {
 			// Delay
 			_nextFrameTime = g_system->getMillis() + (256 - tempo) * 1000;
-		} else if (tempo <= 60) {
+		} else if (tempo <= 120) {
 			// FPS
 			_currentFrameRate = tempo;
 			_nextFrameTime = g_system->getMillis() + 1000.0 / (float)_currentFrameRate;


Commit: 65b43f1c570932a22d80f7cafd358ce8528bc51c
    https://github.com/scummvm/scummvm/commit/65b43f1c570932a22d80f7cafd358ce8528bc51c
Author: djsrv (dservilla at gmail.com)
Date: 2021-08-05T16:48:48-04:00

Commit Message:
DIRECTOR: Improve tempo stub

Warns about all unhandled tempos now.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f3ab782672..4590ddc77f 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -460,10 +460,7 @@ void Score::update() {
 			_currentFrameRate = tempo;
 			_nextFrameTime = g_system->getMillis() + 1000.0 / (float)_currentFrameRate;
 		} else {
-			if (tempo >= 136) {
-				// TODO Wait for channel tempo - 135
-				warning("STUB: tempo >= 136");
-			} else if (tempo == 128) {
+			if (tempo == 128) {
 				_waitForClick = true;
 				_waitForClickCursor = false;
 				_vm->setCursor(kCursorMouseUp);
@@ -473,6 +470,8 @@ void Score::update() {
 			} else if (tempo == 134) {
 				// Wait for sound channel 2
 				_waitForChannel = 2;
+			} else {
+				warning("STUB: tempo %d", tempo);
 			}
 			_nextFrameTime = g_system->getMillis();
 		}




More information about the Scummvm-git-logs mailing list