diff options
| author | Paul Gilbert | 2013-10-20 10:32:53 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-10-20 10:32:53 -0400 |
| commit | cb4184738808ab97f28531a0b4ebf384c7cda98b (patch) | |
| tree | f5067ba5bfd585cad04fedbfe5bc7f617d926cfe | |
| parent | f20471d9624cd73d0568560ffa76d1ff74e3cd8d (diff) | |
| download | scummvm-rg350-cb4184738808ab97f28531a0b4ebf384c7cda98b.tar.gz scummvm-rg350-cb4184738808ab97f28531a0b4ebf384c7cda98b.tar.bz2 scummvm-rg350-cb4184738808ab97f28531a0b4ebf384c7cda98b.zip | |
TSAGE: Fix for correctly setting up playing voice number
| -rw-r--r-- | engines/tsage/core.cpp | 3 | ||||
| -rw-r--r-- | engines/tsage/sound.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 3332b12cf6..3021134b46 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 80e6b691aa..bb98d4dc03 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; } |