From 5132cf51e31f604254d5049ea7be2030cd70dfc4 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Tue, 30 Nov 2010 07:57:42 +0000
Subject: Fix bug #3093750 - FT: Truck and Aircraft computer text missing
 (regression).

svn-id: r54665
---
 engines/scumm/string.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 4b09547c8c..aa099b1b57 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -224,10 +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)
-			// subtitles are disabled, don't display the text
-			continue;
-		if (!ConfMan.getBool("subtitles") && (!st->actorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle)))
+		if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (!st->actorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle)))
 			// 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