[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.151,1.152

Travis Howell kirben at users.sourceforge.net
Thu Aug 28 03:02:02 CEST 2003


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

Modified Files:
	string.cpp 
Log Message:

Fix regression that caused subtitles to always be shown in loomcd


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- string.cpp	19 Jul 2003 18:18:01 -0000	1.151
+++ string.cpp	28 Aug 2003 10:00:49 -0000	1.152
@@ -310,7 +310,7 @@
 			if (_version <= 3) {
 				_charset->printChar(c);
 			} else {
-				if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
+				if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle >= 0)) {
 					// Subtitles are turned off, and there is a voice version
 					// of this message -> don't print it. 
 				} else





More information about the Scummvm-git-logs mailing list