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

[Travis Howell]

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

Modified Files:
	string.cpp 
Log Message:

Fix FOA regression I caused.


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- string.cpp	9 Aug 2004 00:58:21 -0000	1.234
+++ string.cpp	12 Aug 2004 04:19:47 -0000	1.235
@@ -46,14 +46,17 @@
 
 	if (buffer[0] == 0xFF && buffer[1] == 10) {
 		uint32 a, b;
+		int channel = 0;
 
 		a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24);
 		b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24);
 
 		// Sam and Max uses a caching system, printing empty messages
 		// and setting VAR_V6_SOUNDMODE beforehand. See patch 609791.
-		if (VAR(VAR_V6_SOUNDMODE) != 2)
-			_sound->talkSound(a, b, 1, VAR(VAR_V6_SOUNDMODE));
+		if (_gameId == GID_SAMNMAX && VAR(VAR_V6_SOUNDMODE) != 2)
+			channel = VAR(VAR_V6_SOUNDMODE);
+
+		_sound->talkSound(a, b, 1, channel);
 	}
 }