diff options
author | Sven Hesse | 2010-08-08 00:55:27 +0000 |
---|---|---|
committer | Sven Hesse | 2010-08-08 00:55:27 +0000 |
commit | bab55f3a1d8f24e959fa98bda3a775452cc14198 (patch) | |
tree | a4f57b23f3992e6dfe38bc45bce5583d47c89a6b /engines/gob/scenery.cpp | |
parent | a2847e853b9b87f53185b6e6dd0f9ab0d3aae587 (diff) | |
download | scummvm-rg350-bab55f3a1d8f24e959fa98bda3a775452cc14198.tar.gz scummvm-rg350-bab55f3a1d8f24e959fa98bda3a775452cc14198.tar.bz2 scummvm-rg350-bab55f3a1d8f24e959fa98bda3a775452cc14198.zip |
GOB: Adapt the remaining bits to the new VideoPlayer interface
svn-id: r51895
Diffstat (limited to 'engines/gob/scenery.cpp')
-rw-r--r-- | engines/gob/scenery.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 89adffc5ea..7fd1429aac 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -621,15 +621,21 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, // Seek to frame if (_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) < 256) { - while (((int32)_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1)) <= frame) - _vm->_vidPlayer->slotPlay(obj.videoSlot - 1); + VideoPlayer::Properties props; + + props.lastFrame = frame + 1; + _vm->_vidPlayer->play(obj.videoSlot - 1, props); + } else { - int16 curFrame = _vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1); + int16 curFrame = _vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) + 1; uint8 frameWrap = curFrame / 256; frame = (frame + 1) % 256; - while (((int32)_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1)) < (frameWrap * 256 + frame)) - _vm->_vidPlayer->slotPlay(obj.videoSlot - 1); + VideoPlayer::Properties props; + + props.lastFrame = frameWrap * 256 + frame; + + _vm->_vidPlayer->play(obj.videoSlot - 1, props); } /* @@ -718,7 +724,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, _vm->_draw->_spriteLeft = _vm->_vidPlayer->getWidth(obj.videoSlot - 1) - (destX + _vm->_draw->_spriteRight); - _vm->_vidPlayer->slotCopyFrame(obj.videoSlot - 1, _vm->_draw->_backSurface->getVidMem(), + _vm->_vidPlayer->copyFrame(obj.videoSlot - 1, _vm->_draw->_backSurface->getVidMem(), _vm->_draw->_spriteLeft, _vm->_draw->_spriteTop, _vm->_draw->_spriteRight, _vm->_draw->_spriteBottom, _vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY, |