[Scummvm-cvs-logs] SF.net SVN: scummvm: [32146] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sat May 17 06:07:17 CEST 2008
Revision: 32146
http://scummvm.svn.sourceforge.net/scummvm/?rev=32146&view=rev
Author: drmccoy
Date: 2008-05-16 21:07:16 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Fixing the "object videos not minding drawing order / limits" glitch in Woodruff
Modified Paths:
--------------
scummvm/trunk/engines/gob/mult_v2.cpp
scummvm/trunk/engines/gob/scenery.cpp
Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp 2008-05-16 20:40:24 UTC (rev 32145)
+++ scummvm/trunk/engines/gob/mult_v2.cpp 2008-05-17 04:07:16 UTC (rev 32146)
@@ -755,7 +755,7 @@
animData.frame = 0;
if ((animData.animation < 0) && (animObj.videoSlot > 0)) {
_vm->_vidPlayer->slotClose(animObj.videoSlot - 1);
- animObj.videoSlot = 0;
+ animObj.videoSlot = 0;
}
break;
Modified: scummvm/trunk/engines/gob/scenery.cpp
===================================================================
--- scummvm/trunk/engines/gob/scenery.cpp 2008-05-16 20:40:24 UTC (rev 32145)
+++ scummvm/trunk/engines/gob/scenery.cpp 2008-05-17 04:07:16 UTC (rev 32146)
@@ -623,8 +623,8 @@
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 @@
}
- if (flags & 4) {
+ if (!(flags & 4)) {
_animLeft = _toRedrawLeft = left;
_animTop = _toRedrawTop = top;
_animRight = _toRedrawRight = right;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list