diff options
| author | Sven Hesse | 2011-01-18 07:03:42 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-18 07:03:42 +0000 |
| commit | f33b84ff3d1b1f1a8efac54696046983be5f5de7 (patch) | |
| tree | 9244cae5729454ee8ee0ebe0df61af4070458ddf /engines | |
| parent | 94f5bec0f61f68f797534b5ee516efafeaa1eedd (diff) | |
| download | scummvm-rg350-f33b84ff3d1b1f1a8efac54696046983be5f5de7.tar.gz scummvm-rg350-f33b84ff3d1b1f1a8efac54696046983be5f5de7.tar.bz2 scummvm-rg350-f33b84ff3d1b1f1a8efac54696046983be5f5de7.zip | |
GOB: Fix Woodruff object videos
svn-id: r55289
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/inter_v4.cpp | 9 | ||||
| -rw-r--r-- | engines/gob/scenery.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp index 698dddeae9..033262ebbc 100644 --- a/engines/gob/inter_v4.cpp +++ b/engines/gob/inter_v4.cpp @@ -184,16 +184,19 @@ void Inter_v4::o4_playVmdOrMusic() { if (_vm->_mult->_objects[props.startFrame].videoSlot > 0) _vm->_vidPlayer->closeVideo(_vm->_mult->_objects[props.startFrame].videoSlot - 1); + uint32 x = props.x; + uint32 y = props.y; + int slot = _vm->_vidPlayer->openVideo(false, fileName, props); _vm->_mult->_objects[props.startFrame].videoSlot = slot + 1; - if (props.x == -1) { + if (x == 0xFFFFFFFF) { *_vm->_mult->_objects[props.startFrame].pPosX = _vm->_vidPlayer->getDefaultX(slot); *_vm->_mult->_objects[props.startFrame].pPosY = _vm->_vidPlayer->getDefaultY(slot); } else { - *_vm->_mult->_objects[props.startFrame].pPosX = props.x; - *_vm->_mult->_objects[props.startFrame].pPosY = props.y; + *_vm->_mult->_objects[props.startFrame].pPosX = x; + *_vm->_mult->_objects[props.startFrame].pPosY = y; } return; diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp index ec33137739..fbaa7fa864 100644 --- a/engines/gob/scenery.cpp +++ b/engines/gob/scenery.cpp @@ -737,7 +737,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags, _vm->_draw->_spriteLeft, _vm->_draw->_spriteTop, _vm->_draw->_spriteRight, _vm->_draw->_spriteBottom, _vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY, - _vm->_draw->_backSurface->getWidth(), + _vm->_draw->_backSurface->getWidth(), 1, (_vm->_draw->_transparency != 0) ? 0 : -1); _vm->_draw->invalidateRect(_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY, |