[Scummvm-cvs-logs] SF.net SVN: scummvm:[55050] scummvm/trunk/engines/scumm/string.cpp

[Kirben at users.sourceforge.net]

Revision: 55050
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55050&view=rev
Author:   Kirben
Date:     2010-12-27 14:07:53 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
SCUMM: Fix bug #3145951 - DIG: Subtitles won't turn off (regression).

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2010-12-27 14:02:17 UTC (rev 55049)
+++ scummvm/trunk/engines/scumm/string.cpp	2010-12-27 14:07:53 UTC (rev 55050)
@@ -224,7 +224,7 @@
 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 || _mixer->isSoundHandleActive(_sound->_talkChannelHandle)))
+		if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (!st->actorSpeechMsg || _sound->isSoundRunning(kTalkSoundID)))
 			// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.