Fixing the "object videos not minding drawing order / limits" glitch in Woodruff

svn-id: r32146
This commit is contained in:
Sven Hesse 2008-05-17 04:07:16 +00:00
parent 9ce0b62108
commit 5127f1a8f1
2 changed files with 4 additions and 4 deletions

View File

@ -755,7 +755,7 @@ void Mult_v2::newCycleAnim(Mult_Object &animObj) {
animData.frame = 0;
if ((animData.animation < 0) && (animObj.videoSlot > 0)) {
_vm->_vidPlayer->slotClose(animObj.videoSlot - 1);
animObj.videoSlot = 0;
animObj.videoSlot = 0;
}
break;

View File

@ -623,8 +623,8 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
Mult::Mult_Object &obj = _vm->_mult->_objects[-animation - 1];
if (!_vm->_vidPlayer->slotIsOpen(obj.videoSlot - 1)) {
_toRedrawLeft = -1234;
if ((obj.videoSlot == 0) || !_vm->_vidPlayer->slotIsOpen(obj.videoSlot - 1)) {
_toRedrawLeft = -12345;
return;
}
@ -736,7 +736,7 @@ void Scenery::updateAnim(int16 layer, int16 frame, int16 animation, int16 flags,
}
if (flags & 4) {
if (!(flags & 4)) {
_animLeft = _toRedrawLeft = left;
_animTop = _toRedrawTop = top;
_animRight = _toRedrawRight = right;