[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.218,1.219
Travis Howell
kirben at users.sourceforge.net
Thu May 6 03:08:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19751/scumm
Modified Files:
string.cpp
Log Message:
Fix bug #910216
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- string.cpp 25 Apr 2004 13:34:19 -0000 1.218
+++ string.cpp 6 May 2004 10:07:17 -0000 1.219
@@ -282,7 +282,7 @@
if (_version <= 3) {
_charset->printChar(c);
} else {
- if (!ConfMan.getBool("subtitles") && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
+ if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (_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
More information about the Scummvm-git-logs
mailing list