aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/string.cpp5
1 files changed, 1 insertions, 4 deletions
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);