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

[sluicebox]

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:
e397f36be2 SCI: Remove redundant checks
b85d24a83a SCI: Clarify operator precedence in getAudioStream


Commit: e397f36be296c295acf930dd1f4186c4ad3a60ae
    https://github.com/scummvm/scummvm/commit/e397f36be296c295acf930dd1f4186c4ad3a60ae
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-03T20:53:50-07:00

Commit Message:
SCI: Remove redundant checks

Changed paths:
    engines/sci/engine/tts.cpp
    engines/sci/graphics/video32.cpp
    engines/sci/video/robot_decoder.cpp


diff --git a/engines/sci/engine/tts.cpp b/engines/sci/engine/tts.cpp
index e6b10f235e1..7c16a9b5514 100644
--- a/engines/sci/engine/tts.cpp
+++ b/engines/sci/engine/tts.cpp
@@ -65,8 +65,6 @@ Common::String SciTTS::getMessage(const Common::String &text) {
 	// KQ6 or spaces in KQ5, so that a calligraphic first letter is drawn instead.
 	if (_curMessage.size() > 0 && text.size() > 0 && text.hasSuffix(_curMessage.substr(1)))
 		message = _curMessage;
-	else
-		message = text;
 
 	// Strip color code characters in SCI1.1
 	if (getSciVersion() == SCI_VERSION_1_1) {
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index ffc70321707..786a9a95458 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -1236,9 +1236,7 @@ void DuckPlayer::play(const int lastFrameNo) {
 		return;
 	}
 
-	if (_status != kDuckPlaying) {
-		_status = kDuckPlaying;
-	}
+	_status = kDuckPlaying;
 
 	if (lastFrameNo != -1) {
 		_decoder->setEndFrame(lastFrameNo);
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index 04d9f248e16..f0256e1c379 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -1282,9 +1282,7 @@ void RobotDecoder::frameNowVisible() {
 		_audioList.submitDriverMax();
 	}
 
-	if (_previousFrameNo != _currentFrameNo) {
-		_previousFrameNo = _currentFrameNo;
-	}
+	_previousFrameNo = _currentFrameNo;
 
 	if (!_syncFrame && _hasAudio && getTickCount() >= _checkAudioSyncTime) {
 		RobotAudioStream::StreamState status;


Commit: b85d24a83acd66528578f388075cf50909270775
    https://github.com/scummvm/scummvm/commit/b85d24a83acd66528578f388075cf50909270775
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-03T20:54:41-07:00

Commit Message:
SCI: Clarify operator precedence in getAudioStream

Changed paths:
    engines/sci/sound/audio.cpp


diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 21ec9b0cd18..cf202a0eb97 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -445,7 +445,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 			if (!ret)
 				error("Failed to load WAV from stream");
 
-			*sampleLen = (waveFlags & Audio::FLAG_16BITS ? waveSize >> 1 : waveSize) * 60 / waveRate;
+			*sampleLen = ((waveFlags & Audio::FLAG_16BITS) ? (waveSize >> 1) : waveSize) * 60 / waveRate;
 
 			memoryStream->seek(0, SEEK_SET);
 			audioStream = Audio::makeWAVStream(memoryStream, DisposeAfterUse::YES);