[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.74,1.75

James Brown ender at users.sourceforge.net
Sat Dec 28 17:22:05 CET 2002


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

Modified Files:
	string.cpp 
Log Message:
fix cutoff hack workaround


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- string.cpp	28 Dec 2002 15:16:26 -0000	1.74
+++ string.cpp	29 Dec 2002 01:21:58 -0000	1.75
@@ -164,6 +164,12 @@
 		return;
 
 	if (_haveMsg != 0xFF && _haveMsg != 0xFE) {
+		// 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))
+				return;
+
 		if (_sound->_sfxMode == 0)
 			stopTalk();
 		return;





More information about the Scummvm-git-logs mailing list