[Scummvm-cvs-logs] scummvm master -> cb4184738808ab97f28531a0b4ebf384c7cda98b
dreammaster
dreammaster at scummvm.org
Sun Oct 20 16:33:25 CEST 2013
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:
cb41847388 TSAGE: Fix for correctly setting up playing voice number
Commit: cb4184738808ab97f28531a0b4ebf384c7cda98b
https://github.com/scummvm/scummvm/commit/cb4184738808ab97f28531a0b4ebf384c7cda98b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-20T07:32:53-07:00
Commit Message:
TSAGE: Fix for correctly setting up playing voice number
Changed paths:
engines/tsage/core.cpp
engines/tsage/sound.cpp
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3332b12..3021134 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1783,6 +1783,9 @@ void SceneItem::display(int resNum, int lineNum, ...) {
if (!playList.empty()) {
R2_GLOBALS._playStream.play(*playList.begin(), NULL);
playList.pop_front();
+ } else if (!(R2_GLOBALS._speechSubtitles & SPEECH_TEXT)) {
+ // If not showing text, don't both waiting for a click to end
+ break;
}
}
}
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 80e6b69..bb98d4d 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2614,7 +2614,7 @@ bool PlayStream::play(int voiceNum, EventHandler *endAction) {
g_vm->_mixer->playStream(Audio::Mixer::kSpeechSoundType, &_soundHandle,
audioStream, DisposeAfterUse::YES);
-
+ _voiceNum = voiceNum;
return true;
}
More information about the Scummvm-git-logs
mailing list