[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.142,1.143

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29944

Modified Files:
	string.cpp 
Log Message:
_talkChannel can legally be 0, too

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- string.cpp	26 Jun 2003 15:48:12 -0000	1.142
+++ string.cpp	2 Jul 2003 00:38:17 -0000	1.143
@@ -153,7 +153,7 @@
 		// FIXME: DIG and CMI never set sfxMode or any actor talk data...
 		// This hack will force the backup cutoff system to be used instead,
 		// unless the talkChannel is null (eg, this string has no sound attached)
-		if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel > 0))
+		if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel >= 0))
 			return;
 
 		if ((_sound->_sfxMode & 2) == 0)
@@ -298,7 +298,7 @@
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannel > 0)) {
+				if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannel >= 0)) {
 					// Subtitles are turned off, and there is a voice version
 					// of this message -> don't print it. 
 				} else