[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.235,1.236

Travis Howell kirben at users.sourceforge.net
Thu Aug 12 18:03:26 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12210/scumm

Modified Files:
	string.cpp 
Log Message:

Ooos


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- string.cpp	12 Aug 2004 04:19:47 -0000	1.235
+++ string.cpp	13 Aug 2004 01:02:24 -0000	1.236
@@ -53,10 +53,11 @@
 
 		// Sam and Max uses a caching system, printing empty messages
 		// and setting VAR_V6_SOUNDMODE beforehand. See patch 609791.
-		if (_gameId == GID_SAMNMAX && VAR(VAR_V6_SOUNDMODE) != 2)
+		if (_gameId == GID_SAMNMAX)
 			channel = VAR(VAR_V6_SOUNDMODE);
 
-		_sound->talkSound(a, b, 1, channel);
+		 if (channel != 2)
+			_sound->talkSound(a, b, 1, channel);
 	}
 }
 





More information about the Scummvm-git-logs mailing list