[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.51,1.52 gfx.cpp,1.70,1.71 object.cpp,1.56,1.57
James Brown
ender at users.sourceforge.net
Thu Apr 18 09:10:47 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv14073
Modified Files:
actor.cpp gfx.cpp object.cpp
Log Message:
Move putClass forceclip into costume renderer. Fixes Loom bugs.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** actor.cpp 18 Apr 2002 00:56:30 -0000 1.51
--- actor.cpp 18 Apr 2002 15:34:45 -0000 1.52
***************
*** 746,751 ****
turnToDirection(a, angle);
startAnimActor(a, a->standFrame);
! break;
! }
}
}
--- 746,750 ----
turnToDirection(a, angle);
startAnimActor(a, a->standFrame);
! break; }
}
}
***************
*** 911,914 ****
--- 910,918 ----
if (a == NULL || !a->needRedraw)
return;
+
+ if (g_scumm->getClass(a->number, 20))
+ a->mask = 0;
+ else if (g_scumm->getClass(a->number, 21))
+ a->forceClip = 1;
a->needRedraw = false;
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** gfx.cpp 18 Apr 2002 15:02:57 -0000 1.70
--- gfx.cpp 18 Apr 2002 15:34:45 -0000 1.71
***************
*** 2233,2237 ****
{
int w, h, i;
!
l >>= 3;
if (l < 0)
--- 2233,2237 ----
{
int w, h, i;
!
l >>= 3;
if (l < 0)
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** object.cpp 18 Apr 2002 09:19:58 -0000 1.56
--- object.cpp 18 Apr 2002 15:34:45 -0000 1.57
***************
*** 48,70 ****
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
! }
!
! if (_features & GF_SMALL_HEADER) {
! if (cls == 21 )
! {
! Actor *a;
! a=derefActor(obj);
! a->forceClip=1;
! return;
! }
! if (cls == 20 )
! {
! Actor *a;
! a=derefActor(obj);
! a->mask=0;
! return;
! }
! }
!
if (set)
_classData[obj] |= (1 << (cls - 1));
--- 48,53 ----
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
! }
!
if (set)
_classData[obj] |= (1 << (cls - 1));
More information about the Scummvm-git-logs
mailing list