diff options
author | Filippos Karapetis | 2015-12-07 01:11:29 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:33:52 +0100 |
commit | 2eb430dcff861bfe1809e10d57e26e79b8beb9ed (patch) | |
tree | 9e7f79a1f99575044d4a062c7c22cd2f57f16a6b | |
parent | 0f41d8894ca14f7ab4de3adae09576425bd634ea (diff) | |
download | scummvm-rg350-2eb430dcff861bfe1809e10d57e26e79b8beb9ed.tar.gz scummvm-rg350-2eb430dcff861bfe1809e10d57e26e79b8beb9ed.tar.bz2 scummvm-rg350-2eb430dcff861bfe1809e10d57e26e79b8beb9ed.zip |
LAB: Simplify the calling code of playSoundEffect()
-rw-r--r-- | engines/lab/anim.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp index 545b487320..7d2d171ae7 100644 --- a/engines/lab/anim.cpp +++ b/engines/lab/anim.cpp @@ -530,7 +530,7 @@ void Anim::diffNextFrame() { break; case 30L: - case 31L: { + case 31L: if (_waitForEffect) { while (_vm->_music->isSoundEffectActive()) { _vm->_music->updateMusic(); @@ -545,13 +545,9 @@ void Anim::diffNextFrame() { _sampleSpeed = READ_LE_UINT16(_diffFile); _diffFile += 4; - byte *music = _diffFile; - uint32 musicsize = _size; + _vm->_music->playSoundEffect(_sampleSpeed, _size, _diffFile); _diffFile += _size; - - _vm->_music->playSoundEffect(_sampleSpeed, musicsize, music); break; - } case 65535L: if ((_frameNum == 1) || _playOnce || _stopPlayingEnd) { int didTOF = 0; |