From c8de10cbc525e60249bfad82ef39d55b8d0aec30 Mon Sep 17 00:00:00 2001
From: James Brown <ender@users.sourceforge.net>
Date: Sun, 29 Dec 2002 01:21:58 +0000
Subject: [PATCH] fix cutoff hack workaround

svn-id: r6245
---
 scumm/string.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scumm/string.cpp b/scumm/string.cpp
index 7d238859c75..8ba55745696 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -164,6 +164,12 @@ void Scumm::CHARSET_1()
 		return;
 
 	if (_haveMsg != 0xFF && _haveMsg != 0xFE) {
+		// FIXME: DIG and CMI never set sfxMode or any actor talk data...
+		// This hack will force the backup cutoff system to be used instead,
+		// unless the talkChannel is null (eg, this string has no sound attached)
+		if ((_gameId == GID_CMI || _gameId == GID_DIG) && (_sound->_talkChannel > 0))
+				return;
+
 		if (_sound->_sfxMode == 0)
 			stopTalk();
 		return;