diff options
| author | Max Horn | 2003-06-01 13:11:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-01 13:11:30 +0000 |
| commit | 8b39e81afeb3e2e7ba0c4c9b403051ec82a7f3b3 (patch) | |
| tree | 486ace3ff4efd9b9a7e4db98c5a13dc0881a5b31 /scumm | |
| parent | 9cbcde684b35df63693c0f72dd14a8173f4d5265 (diff) | |
| download | scummvm-rg350-8b39e81afeb3e2e7ba0c4c9b403051ec82a7f3b3.tar.gz scummvm-rg350-8b39e81afeb3e2e7ba0c4c9b403051ec82a7f3b3.tar.bz2 scummvm-rg350-8b39e81afeb3e2e7ba0c4c9b403051ec82a7f3b3.zip | |
cleanup
svn-id: r8236
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 10 |
1 files 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; |