diff options
author | Torbjörn Andersson | 2004-05-07 06:54:47 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-05-07 06:54:47 +0000 |
commit | 701bd797b72ba3f163f3250ac2bfae2323153ab7 (patch) | |
tree | 4a98234870998afebae7a8d1b6afae6b5b3fda93 /scumm | |
parent | 6d02fd9d74a759325ae2148a014383d1a107ad28 (diff) | |
download | scummvm-rg350-701bd797b72ba3f163f3250ac2bfae2323153ab7.tar.gz scummvm-rg350-701bd797b72ba3f163f3250ac2bfae2323153ab7.tar.bz2 scummvm-rg350-701bd797b72ba3f163f3250ac2bfae2323153ab7.zip |
Only access VAR_VOICE_MODE if there actually is one.
svn-id: r13802
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/string.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 5eafe8e679..a86d956a4d 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -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 |