[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.128,1.129

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19687

Modified Files:
	sound.cpp 
Log Message:
cleanup

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- sound.cpp	26 May 2003 23:23:44 -0000	1.128
+++ sound.cpp	1 Jun 2003 13:11:30 -0000	1.129
@@ -438,13 +438,7 @@
 
 	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 @@
 			}
 		}
 		
-		if (finished  && _scumm->_talkDelay == 0) {
+		if (finished && _scumm->_talkDelay == 0) {
 			_scumm->stopTalk();
 			_sfxMode &= ~2;
 			_talkChannel = -1;