aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/threads
diff options
context:
space:
mode:
authorjohndoe1232018-05-17 06:22:13 +1000
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commita76612ec5a91847e7e23652614d5e572af2c4aab (patch)
tree733277ce9a739a3f336c78049627225f545c442e /engines/illusions/threads
parent4637104e6d289ab42d5eb02e0f42f48133180542 (diff)
downloadscummvm-rg350-a76612ec5a91847e7e23652614d5e572af2c4aab.tar.gz
scummvm-rg350-a76612ec5a91847e7e23652614d5e572af2c4aab.tar.bz2
scummvm-rg350-a76612ec5a91847e7e23652614d5e572af2c4aab.zip
ILLUSIONS: Implement voice pausing/unpausing
(cherry picked from commit a70cf1d)
Diffstat (limited to 'engines/illusions/threads')
-rw-r--r--engines/illusions/threads/talkthread.cpp4
-rw-r--r--engines/illusions/threads/talkthread_duckman.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 7c2e01276e..c7f7a67b0e 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -282,7 +282,7 @@ void TalkThread::onPause() {
case 6:
case 7:
if (!(_flags & 4)) {
- // TODO audvocPauseVoice();
+ _vm->_soundMan->pauseVoice();
}
if (!(_flags & 8)) {
_textDurationElapsed = getDurationElapsed(_textStartTime, _textEndTime);
@@ -313,7 +313,7 @@ void TalkThread::onUnpause() {
break;
case 6:
if (!(_flags & 4)) {
- // TODO audvocUnpauseVoice();
+ _vm->_soundMan->unpauseVoice();
}
if (!(_flags & 8)) {
_textStartTime = getCurrentTime();
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 36911597ff..2b1294c846 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -206,7 +206,7 @@ int TalkThread_Duckman::onUpdate() {
void TalkThread_Duckman::onPause() {
if (_status == 5) {
if (!(_flags & 4)) {
- _vm->_soundMan->pauseVoice(true);
+ _vm->_soundMan->pauseVoice();
}
if (!(_flags & 8))
_textDurationElapsed = getDurationElapsed(_textStartTime, _textEndTime);
@@ -220,7 +220,7 @@ void TalkThread_Duckman::onUnpause() {
_vm->_soundMan->cueVoice((char*)talkEntry->_voiceName);
} else if (_status == 5) {
if (!(_flags & 4)) {
- _vm->_soundMan->pauseVoice(false);
+ _vm->_soundMan->unpauseVoice();
}
if (!(_flags & 8)) {
_textStartTime = getCurrentTime();