diff options
| author | Sven Hesse | 2010-08-08 00:34:33 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:34:33 +0000 |
| commit | f8a43ee35f4ca2a409558fbb6bf978cc2ae54ab4 (patch) | |
| tree | b5ca6120a37f2709c42b5544a9b338abe956ba8a /engines/gob/scenery.cpp | |
| parent | a802e1e64f56b5c6b0534a481e84418078b2699f (diff) | |
| download | scummvm-rg350-f8a43ee35f4ca2a409558fbb6bf978cc2ae54ab4.tar.gz scummvm-rg350-f8a43ee35f4ca2a409558fbb6bf978cc2ae54ab4.tar.bz2 scummvm-rg350-f8a43ee35f4ca2a409558fbb6bf978cc2ae54ab4.zip | |
GOB: Stub the new VideoPlayer interface
This is will be the new, less convoluted interface for playing videos
within the gob engine. No actual functionality is implemented yet, and
old functions are mostly commented out for now.
svn-id: r51851
Diffstat (limited to 'engines/gob/scenery.cpp')
| -rw-r--r-- | engines/gob/scenery.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index 6b5982ec3e..edd2051f1a 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -616,19 +616,19 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, return; } - if (frame >= _vm->_vidPlayer->getFrameCount(obj.videoSlot - 1)) + if (frame >= ((int16)_vm->_vidPlayer->getFrameCount(obj.videoSlot - 1))) frame = _vm->_vidPlayer->getFrameCount(obj.videoSlot - 1) - 1; // Seek to frame if (_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) < 256) { - while (_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) <= frame) + while (((int32)_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1)) <= frame) _vm->_vidPlayer->slotPlay(obj.videoSlot - 1); } else { int16 curFrame = _vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1); uint8 frameWrap = curFrame / 256; frame = (frame + 1) % 256; - while (_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1) < (frameWrap * 256 + frame)) + while (((int32)_vm->_vidPlayer->getCurrentFrame(obj.videoSlot - 1)) < (frameWrap * 256 + frame)) _vm->_vidPlayer->slotPlay(obj.videoSlot - 1); } |