From e9269257f3da947eca3fb167b279fbe91650157a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 24 Dec 2003 00:25:18 +0000
Subject: turned PlayingSoundHandle into an 'opaque' (well not really :-) data
 type, mainly because people kept (accidentally and sometimes on purpose :-)
 misusing them

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

(limited to 'scumm/string.cpp')

diff --git a/scumm/string.cpp b/scumm/string.cpp
index f9f01f8f51..69d5ed5e6c 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -163,7 +163,7 @@ void ScummEngine::CHARSET_1() {
 	if (_talkDelay)
 		return;
 
-	if ((_gameId == GID_CMI || _gameId == GID_DIG) && _sound->_talkChannelHandle) {
+	if ((_gameId == GID_CMI || _gameId == GID_DIG) && _sound->_talkChannelHandle.isActive()) {
 		// Keep the 'speech' flag in _sound->_sfxMode set as long as the
 		// _talkChannelHandle is valid.
 		_sound->_sfxMode |= 2;
@@ -317,7 +317,7 @@ void ScummEngine::CHARSET_1() {
 			} else {
 				if ((_gameId == GID_LOOM256) && _noSubtitles && (_sound->pollCD())) {
 					// Special case for loomcd, since it only uses CD audio.for sound
-				} else if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
+				} else if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle.isActive())) {
 					// Subtitles are turned off, and there is a voice version
 					// of this message -> don't print it. 
 				} else
-- 
cgit v1.2.3