[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.137,1.138

[Max Horn]

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

Modified Files:
	string.cpp 
Log Message:
better (proper? hm...) code to deal with turning of subtitles in V7/V8 games

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- string.cpp	9 Jun 2003 00:40:53 -0000	1.137
+++ string.cpp	9 Jun 2003 00:51:09 -0000	1.138
@@ -302,7 +302,10 @@
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if (!_noSubtitles || _haveMsg != 0xFE)
+				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
 					_charset->printChar(c);
 			}