diff options
| author | Travis Howell | 2010-11-30 07:57:42 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-11-30 07:57:42 +0000 |
| commit | 5132cf51e31f604254d5049ea7be2030cd70dfc4 (patch) | |
| tree | 023199a91d20384861ebf4ce209c45aad611c23c /engines/scumm/string.cpp | |
| parent | 7aca10bf9a4e28eb9c3d7966cd8d71cd29e921d4 (diff) | |
| download | scummvm-rg350-5132cf51e31f604254d5049ea7be2030cd70dfc4.tar.gz scummvm-rg350-5132cf51e31f604254d5049ea7be2030cd70dfc4.tar.bz2 scummvm-rg350-5132cf51e31f604254d5049ea7be2030cd70dfc4.zip | |
Fix bug #3093750 - FT: Truck and Aircraft computer text missing (regression).
svn-id: r54665
Diffstat (limited to 'engines/scumm/string.cpp')
| -rw-r--r-- | engines/scumm/string.cpp | 5 |
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); |