From fe12e08dd68766ee460e5fcf8f61cdafd70b9b39 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 27 Dec 2010 14:07:53 +0000 Subject: SCUMM: Fix bug #3145951 - DIG: Subtitles won't turn off (regression). svn-id: r55050 --- engines/scumm/string.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/scumm/string.cpp') 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); -- cgit v1.2.3