SCUMM: Fix bug #3145951 - DIG: Subtitles won't turn off (regression).

svn-id: r55050
This commit is contained in:
Travis Howell 2010-12-27 14:07:53 +00:00
parent e7e92a7577
commit fe12e08dd6

View File

@ -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);