From cfbac503addad7af26a5d9f8795edfd229faefb0 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 28 Dec 2010 05:43:03 +0000
Subject: SCUMM: Another fix for bug #3145951 - DIG: Subtitles won't turn off
 (regression).

svn-id: r55052
---
 engines/scumm/string.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/scumm/string.cpp')

diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index b180c391d5..04ff72ec02 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -224,7 +224,10 @@ 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 || _sound->isSoundRunning(kTalkSoundID)))
+		if ((_game.id == GID_DIG || _game.id == GID_CMI) && (!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0))
+			// subtitles are disabled, don't display the text 	 
+			continue; 	 
+		if (_game.id == GID_FT && !st->actorSpeechMsg && (!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0))
 			// 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