[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.176,1.177

Travis Howell kirben at users.sourceforge.net
Sun Jan 4 06:33:08 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8032/scumm

Modified Files:
	string.cpp 
Log Message:

Allow subtitles to be disabled in games using imuse digital again.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- string.cpp	27 Dec 2003 15:22:59 -0000	1.176
+++ string.cpp	4 Jan 2004 14:32:26 -0000	1.177
@@ -319,7 +319,9 @@
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
+				if (!ConfMan.getBool("subtitles") && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
+					// 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
 				} else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _sound->_talkChannelHandle.isActive())) {
 					// Subtitles are turned off, and there is a voice version





More information about the Scummvm-git-logs mailing list