From c2ef3a1afb70394bcee69503762ebe9fc88599da Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 10 Jun 2003 06:41:16 +0000
Subject: 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")

svn-id: r8427
---
 scumm/string.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scumm/string.cpp')

diff --git a/scumm/string.cpp b/scumm/string.cpp
index 9006d90b0d..fcf9e49ff5 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -160,7 +160,7 @@ void Scumm::CHARSET_1() {
 		if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel > 0))
 			return;
 
-		if (_sound->_sfxMode == 0)
+		if ((_sound->_sfxMode & 2) == 0)
 			stopTalk();
 		return;
 	}
-- 
cgit v1.2.3