aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2010-08-08 00:54:52 +0000
committerSven Hesse2010-08-08 00:54:52 +0000
commita2847e853b9b87f53185b6e6dd0f9ab0d3aae587 (patch)
treee16b7a218a8e7a8686c243072f4c1553b4320a88
parent424e802bb92119ce9a8f95b2399a23d911d061e7 (diff)
downloadscummvm-rg350-a2847e853b9b87f53185b6e6dd0f9ab0d3aae587.tar.gz
scummvm-rg350-a2847e853b9b87f53185b6e6dd0f9ab0d3aae587.tar.bz2
scummvm-rg350-a2847e853b9b87f53185b6e6dd0f9ab0d3aae587.zip
GOB: Make o6_loadCursor use the new VideoPlayer interface
svn-id: r51894
-rw-r--r--engines/gob/inter_v6.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 9248e937bc..d9bb6dd573 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -221,8 +221,11 @@ bool Inter_v6::o6_loadCursor(OpFuncParams &params) {
uint16 start = _vm->_game->_script->readUint16();
int8 index = _vm->_game->_script->readInt8();
- int vmdSlot = _vm->_vidPlayer->slotOpen(file);
+ VideoPlayer::Properties props;
+ props.sprite = -1;
+
+ int vmdSlot = _vm->_vidPlayer->openVideo(false, file, props);
if (vmdSlot == -1) {
warning("Can't open video \"%s\" as cursor", file);
return false;
@@ -231,14 +234,17 @@ bool Inter_v6::o6_loadCursor(OpFuncParams &params) {
int16 framesCount = _vm->_vidPlayer->getFrameCount(vmdSlot);
for (int i = 0; i < framesCount; i++) {
- _vm->_vidPlayer->slotPlay(vmdSlot);
- _vm->_vidPlayer->slotCopyFrame(vmdSlot, _vm->_draw->_cursorSprites->getVidMem(),
+ props.startFrame = i;
+ props.lastFrame = i;
+
+ _vm->_vidPlayer->play(vmdSlot, props);
+ _vm->_vidPlayer->copyFrame(vmdSlot, _vm->_draw->_cursorSprites->getVidMem(),
0, 0, _vm->_draw->_cursorWidth, _vm->_draw->_cursorWidth,
(start + i) * _vm->_draw->_cursorWidth, 0,
_vm->_draw->_cursorSprites->getWidth());
}
- _vm->_vidPlayer->slotClose(vmdSlot);
+ _vm->_vidPlayer->closeVideo(vmdSlot);
_vm->_draw->_cursorAnimLow[index] = start;
_vm->_draw->_cursorAnimHigh[index] = framesCount + start - 1;