diff options
| author | Travis Howell | 2010-12-28 05:43:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-12-28 05:43:03 +0000 |
| commit | cfbac503addad7af26a5d9f8795edfd229faefb0 (patch) | |
| tree | cd8593c8461c9ac0f48ff1a13e6f10a70172ee63 | |
| parent | 1b8678d5de278caf7470f4e418e038251a015a38 (diff) | |
| download | scummvm-rg350-cfbac503addad7af26a5d9f8795edfd229faefb0.tar.gz scummvm-rg350-cfbac503addad7af26a5d9f8795edfd229faefb0.tar.bz2 scummvm-rg350-cfbac503addad7af26a5d9f8795edfd229faefb0.zip | |
SCUMM: Another fix for bug #3145951 - DIG: Subtitles won't turn off (regression).
svn-id: r55052
| -rw-r--r-- | engines/scumm/string.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |