thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GOB: Fix Woodruff object videos

Browse source 
svn-id: r55289
This commit is contained in:
Sven Hesse 2011-01-18 07:03:42 +00:00
parent 94f5bec0f6
commit f33b84ff3d
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/gob/inter_v4.cpp
View file

@ -184,16 +184,19 @@ void Inter_v4::o4_playVmdOrMusic() {
if (_vm->_mult->_objects[props.startFrame].videoSlot > 0) if (_vm->_mult->_objects[props.startFrame].videoSlot > 0)
_vm->_vidPlayer->closeVideo(_vm->_mult->_objects[props.startFrame].videoSlot - 1); _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); int slot = _vm->_vidPlayer->openVideo(false, fileName, props);
_vm->_mult->_objects[props.startFrame].videoSlot = slot + 1; _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].pPosX = _vm->_vidPlayer->getDefaultX(slot);
*_vm->_mult->_objects[props.startFrame].pPosY = _vm->_vidPlayer->getDefaultY(slot); *_vm->_mult->_objects[props.startFrame].pPosY = _vm->_vidPlayer->getDefaultY(slot);
} else { } else {
*_vm->_mult->_objects[props.startFrame].pPosX = props.x; *_vm->_mult->_objects[props.startFrame].pPosX = x;
*_vm->_mult->_objects[props.startFrame].pPosY = props.y; *_vm->_mult->_objects[props.startFrame].pPosY = y;
} }
return; return;

2
engines/gob/scenery.cpp
View file

@ -737,7 +737,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
_vm->_draw->_spriteLeft, _vm->_draw->_spriteTop, _vm->_draw->_spriteLeft, _vm->_draw->_spriteTop,
_vm->_draw->_spriteRight, _vm->_draw->_spriteBottom, _vm->_draw->_spriteRight, _vm->_draw->_spriteBottom,
_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY, _vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY,
_vm->_draw->_backSurface->getWidth(), _vm->_draw->_backSurface->getWidth(), 1,
(_vm->_draw->_transparency != 0) ? 0 : -1); (_vm->_draw->_transparency != 0) ? 0 : -1);
_vm->_draw->invalidateRect(_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY, _vm->_draw->invalidateRect(_vm->_draw->_destSpriteX, _vm->_draw->_destSpriteY,