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

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Mon Jun 9 23:42:04 CEST 2003


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

Modified Files:
	string.cpp 
Log Message:
CHARSET_1() should only care about talk sound effects, not ordinary ones,
when deciding whether or not to call stopTalk(). Otherwise some looping
sound effects can keep an actor talking forever.

This should fix bug #645976 ("SAM: Sam talks forever inside BOTs diner")


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- string.cpp	9 Jun 2003 00:51:09 -0000	1.138
+++ string.cpp	10 Jun 2003 06:41:16 -0000	1.139
@@ -160,7 +160,7 @@
 		if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel > 0))
 			return;
 
-		if (_sound->_sfxMode == 0)
+		if ((_sound->_sfxMode & 2) == 0)
 			stopTalk();
 		return;
 	}





More information about the Scummvm-git-logs mailing list