diff options
| author | Travis Howell | 2010-12-27 14:07:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-12-27 14:07:53 +0000 |
| commit | fe12e08dd68766ee460e5fcf8f61cdafd70b9b39 (patch) | |
| tree | 35090f494e95970ca0a598bbe8599188a777089c | |
| parent | e7e92a7577fcaadd4d63483a41ab2a71d913c3d6 (diff) | |
| download | scummvm-rg350-fe12e08dd68766ee460e5fcf8f61cdafd70b9b39.tar.gz scummvm-rg350-fe12e08dd68766ee460e5fcf8f61cdafd70b9b39.tar.bz2 scummvm-rg350-fe12e08dd68766ee460e5fcf8f61cdafd70b9b39.zip | |
SCUMM: Fix bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55050
| -rw-r--r-- | engines/scumm/string.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 10e2aacc26..b180c391d5 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -224,7 +224,7 @@ void ScummEngine_v6::removeBlastTexts() { void ScummEngine_v7::processSubtitleQueue() { for (int i = 0; i < _subtitleQueuePos; ++i) { SubtitleText *st = &_subtitleQueue[i]; - if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (!st->actorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) + if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (!st->actorSpeechMsg || _sound->isSoundRunning(kTalkSoundID))) // no subtitles and there's a speech variant of the message, don't display the text continue; enqueueText(st->text, st->xpos, st->ypos, st->color, st->charset, false); |