[Scummvm-cvs-logs] SF.net SVN: scummvm:[54666] scummvm/branches/branch-1-2-0/engines/scumm/ string.cpp

[Kirben at users.sourceforge.net]

Revision: 54666
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54666&view=rev
Author:   Kirben
Date:     2010-11-30 07:57:59 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
Backport fix for bug #3093750 - FT: Truck and Aircraft computer text missing (regression).

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/scumm/string.cpp

Modified: scummvm/branches/branch-1-2-0/engines/scumm/string.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/scumm/string.cpp	2010-11-30 07:57:42 UTC (rev 54665)
+++ scummvm/branches/branch-1-2-0/engines/scumm/string.cpp	2010-11-30 07:57:59 UTC (rev 54666)
@@ -224,10 +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)
-			// 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);


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