From 8b39e81afeb3e2e7ba0c4c9b403051ec82a7f3b3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 1 Jun 2003 13:11:30 +0000
Subject: cleanup

svn-id: r8236
---
 scumm/sound.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 1f35490878..14372bd762 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -438,13 +438,7 @@ void Sound::processSfxQueues() {
 
 	if (_scumm->VAR(_scumm->VAR_TALK_ACTOR)) { //_sfxMode & 2) {
 		act = _scumm->VAR(_scumm->VAR_TALK_ACTOR);
-		if (_talkChannel < 0)
-			finished = false;
-		else if (_scumm->_mixer->_channels[_talkChannel] == NULL) {
-			finished = true;
-		} else
-			finished = false;
-		
+		finished = (_talkChannel >= 0) && (_scumm->_mixer->_channels[_talkChannel] == NULL);
 
 		if (act != 0 && (uint) act < 0x80 && !_scumm->_string[0].no_talk_anim) {
 			a = _scumm->derefActor(act, "processSfxQueues");
@@ -463,7 +457,7 @@ void Sound::processSfxQueues() {
 			}
 		}
 		
-		if (finished  && _scumm->_talkDelay == 0) {
+		if (finished && _scumm->_talkDelay == 0) {
 			_scumm->stopTalk();
 			_sfxMode &= ~2;
 			_talkChannel = -1;
-- 
cgit v1.2.3