From bca746e80211d1b28cddcb7a5791d8dd20984f11 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 12 Aug 2004 04:19:47 +0000
Subject: Fix FOA regression I caused.

svn-id: r14562
---
 scumm/string.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scumm/string.cpp b/scumm/string.cpp
index cd4029c4e4..e9bad9e88e 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -46,14 +46,17 @@ void ScummEngine::unkMessage1(const byte *msg) {
 
 	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);
 	}
 }
 
-- 
cgit v1.2.3