diff options
| author | Willem Jan Palenstijn | 2015-12-26 14:20:15 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-26 14:20:15 +0100 |
| commit | ae519716a207b134e3c287dc53cadb4ef55a389a (patch) | |
| tree | 4c37f8c3310d53bb6cc3791939dbf963cc147ecd /engines/lab/anim.cpp | |
| parent | 01d99d213dae8731c3c9a19cbd98f5fbfb9ee1fc (diff) | |
| parent | 07b554b847d9675d5d97b7ea36ac87ce17e6a1f3 (diff) | |
| download | scummvm-rg350-ae519716a207b134e3c287dc53cadb4ef55a389a.tar.gz scummvm-rg350-ae519716a207b134e3c287dc53cadb4ef55a389a.tar.bz2 scummvm-rg350-ae519716a207b134e3c287dc53cadb4ef55a389a.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/lab/anim.cpp')
| -rw-r--r-- | engines/lab/anim.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp index eb825fb4c0..ea7f568de3 100644 --- a/engines/lab/anim.cpp +++ b/engines/lab/anim.cpp @@ -80,6 +80,9 @@ void Anim::setOutputBuffer(byte *memoryBuffer) { _outputBuffer = memoryBuffer; } +uint16 Anim::getDIFFHeight() { + return _headerdata._height; +} void Anim::diffNextFrame(bool onlyDiffData) { if (_lastBlockHeader == 65535) @@ -90,7 +93,7 @@ void Anim::diffNextFrame(bool onlyDiffData) { byte *startOfBuf = _outputBuffer; int bufPitch = _vm->_graphics->_screenWidth; - if (!_outputBuffer) { + if (!startOfBuf) { startOfBuf = _vm->_graphics->getCurrentDrawingBuffer(); drawOnScreen = true; } @@ -217,7 +220,9 @@ void Anim::diffNextFrame(bool onlyDiffData) { _sampleSpeed = _diffFile->readUint16LE(); _diffFile->skip(2); - _vm->_music->playSoundEffect(_sampleSpeed, _size, _diffFile); + // Sound effects embedded in animations are started here. These are + // usually animation-specific, like door opening sounds, and are not looped + _vm->_music->playSoundEffect(_sampleSpeed, _size, false, _diffFile); break; case 65535: |