From 628a4cb3c35ba908bed3b21d38de1b7320dcbfb0 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 7 May 2004 07:33:10 +0000
Subject: Simpler check

svn-id: r13804
---
 scumm/string.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scumm')

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
-- 
cgit v1.2.3