Only access VAR_VOICE_MODE if there actually is one.

svn-id: r13802
This commit is contained in:
Torbjörn Andersson 2004-05-07 06:54:47 +00:00
parent 6d02fd9d74
commit 701bd797b7

View File

@ -282,7 +282,7 @@ void ScummEngine::CHARSET_1() {
if (_version <= 3) {
_charset->printChar(c);
} else {
if ((!ConfMan.getBool("subtitles") || VAR(VAR_VOICE_MODE) == 0) && (_imuseDigital && _sound->isSoundRunning(kTalkSoundID))) {
if ((!ConfMan.getBool("subtitles") || (VAR_VOICE_MODE != 0xFF && 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