[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.220,1.221
Travis Howell
kirben at users.sourceforge.net
Fri May 7 00:34:00 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27510/scumm
Modified Files:
string.cpp
Log Message:
Simpler check
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- string.cpp 7 May 2004 06:54:47 -0000 1.220
+++ string.cpp 7 May 2004 07:33:10 -0000 1.221
@@ -282,7 +282,7 @@
if (_version <= 3) {
_charset->printChar(c);
} else {
- if ((!ConfMan.getBool("subtitles") || (VAR_VOICE_MODE != 0xFF && VAR(VAR_VOICE_MODE) == 0)) && (_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
More information about the Scummvm-git-logs
mailing list