diff options
| author | Travis Howell | 2004-05-07 07:33:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-05-07 07:33:10 +0000 |
| commit | 628a4cb3c35ba908bed3b21d38de1b7320dcbfb0 (patch) | |
| tree | 54ff12adab08bad5b1179666cd172c73b1ee9c8c /scumm | |
| parent | b672cf26fbe1dd1bcfaaacd7d300b8eb82b6fde7 (diff) | |
| download | scummvm-rg350-628a4cb3c35ba908bed3b21d38de1b7320dcbfb0.tar.gz scummvm-rg350-628a4cb3c35ba908bed3b21d38de1b7320dcbfb0.tar.bz2 scummvm-rg350-628a4cb3c35ba908bed3b21d38de1b7320dcbfb0.zip | |
Simpler check
svn-id: r13804
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 a86d956a4d..c640e68b80 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_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 |