[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.193.2.6,1.193.2.7

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30993/scumm

Modified Files:
      Tag: branch-0-6-0
	string.cpp 
Log Message:

Back port barbar's songs subtitle fix.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.193.2.6
retrieving revision 1.193.2.7
diff -u -d -r1.193.2.6 -r1.193.2.7
--- string.cpp	18 Jul 2004 22:15:53 -0000	1.193.2.6
+++ string.cpp	19 Jul 2004 10:01:36 -0000	1.193.2.7
@@ -299,7 +299,7 @@
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if (!ConfMan.getBool("subtitles") && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
+				if ((_imuseDigital && _sound->isSoundRunning(kTalkSoundID)) && (!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0)) {
 					// Special case for games using imuse digital.for sound
 				} else if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
 					// Special case for loomcd, since it only uses CD audio.for sound