thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Another fix for bug #3145951 - DIG: Subtitles won't turn off (regression).

Browse source 
svn-id: r55052
This commit is contained in:
Travis Howell 2010-12-28 05:43:03 +00:00
parent 1b8678d5de
commit cfbac503ad
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/scumm/string.cpp
View file

@ -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);