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

[Kirben at users.sourceforge.net]

Revision: 55053
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55053&view=rev
Author:   Kirben
Date:     2010-12-28 06:05:57 +0000 (Tue, 28 Dec 2010)

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

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

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2010-12-28 05:43:03 UTC (rev 55052)
+++ scummvm/trunk/engines/scumm/actor.cpp	2010-12-28 06:05:57 UTC (rev 55053)
@@ -2037,7 +2037,7 @@
 	_haveMsg = 1;
 	if (_game.id == GID_FT)
 		VAR(VAR_HAVE_MSG) = 0xFF;
-	_haveActorSpeechMsg = true;
+	_haveActorSpeechMsg = (_game.id == GID_FT) ? true : (!_sound->isSoundRunning(kTalkSoundID));
 	if (_game.id == GID_DIG || _game.id == GID_CMI) {
 		stringWrap = _string[0].wrapping;
 		_string[0].wrapping = true;

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2010-12-28 05:43:03 UTC (rev 55052)
+++ scummvm/trunk/engines/scumm/string.cpp	2010-12-28 06:05:57 UTC (rev 55053)
@@ -224,10 +224,7 @@
 void ScummEngine_v7::processSubtitleQueue() {
 	for (int i = 0; i < _subtitleQueuePos; ++i) {
 		SubtitleText *st = &_subtitleQueue[i];
-		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))
+		if (!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);


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