[Scummvm-git-logs] scummvm master -> 8bc8acf1a3ce33be891133be3a9d530529b3bd80

[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:
2acf86083f DIRECTOR: Do not play sounds in fast mode
8bc8acf1a3 DIRECTOR: Update number of played frames earlier


Commit: 2acf86083f4c18da2c0aaa8d51a4a18a161a846b
    https://github.com/scummvm/scummvm/commit/2acf86083f4c18da2c0aaa8d51a4a18a161a846b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-23T01:51:08+02:00

Commit Message:
DIRECTOR: Do not play sounds in fast mode

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 79fb1ded34..6d8e0d8f2e 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -61,6 +61,9 @@ DirectorSound::~DirectorSound() {
 }
 
 void DirectorSound::playFile(Common::String filename, uint8 soundChannel) {
+	if (debugChannelSet(-1, kDebugFast))
+		return;
+
 	Common::File *file = new Common::File();
 
 	if (!file->open(filename)) {


Commit: 8bc8acf1a3ce33be891133be3a9d530529b3bd80
    https://github.com/scummvm/scummvm/commit/8bc8acf1a3ce33be891133be3a9d530529b3bd80
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-23T01:51:08+02:00

Commit Message:
DIRECTOR: Update number of played frames earlier

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index f178710cdb..632d8d80bd 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1708,6 +1708,9 @@ void Score::startLoop() {
 		if (_currentFrame < _frames.size())
 			_vm->processEvents();
 
+		if (debugChannelSet(-1, kDebugFewFramesOnly))
+			_framesRan++;
+
 		if (debugChannelSet(-1, kDebugFewFramesOnly) && _framesRan > 9) {
 			warning("Score::startLoop(): exiting due to debug few frames only");
 			break;
@@ -1829,9 +1832,6 @@ void Score::update() {
 
 	if (debugChannelSet(-1, kDebugSlow))
 		_nextFrameTime += 1000;
-
-	if (debugChannelSet(-1, kDebugFewFramesOnly))
-		_framesRan++;
 }
 
 void Score::renderFrame(uint16 frameId, bool forceUpdate, bool updateStageOnly) {