[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.55,1.56 script_v1.cpp,1.79,1.80

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv13360

Modified Files:
	object.cpp script_v1.cpp 
Log Message:
Fixed a few clipping issues in Loom the NICE way this time

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** object.cpp	12 Apr 2002 10:34:45 -0000	1.55
--- object.cpp	18 Apr 2002 09:19:58 -0000	1.56
***************
*** 48,53 ****
  		if (cls == 32)							// CLASS_TOUCHABLE
  			cls = 24;
! 	}
! 
  	if (set)
  		_classData[obj] |= (1 << (cls - 1));
--- 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));

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** script_v1.cpp	17 Apr 2002 20:22:20 -0000	1.79
--- script_v1.cpp	18 Apr 2002 09:19:58 -0000	1.80
***************
*** 825,829 ****
  		newClass = getVarOrDirectWord(0x80);
  		if (newClass == 0) {
! 			_classData[act] = 0;
  			continue;
  		}
--- 825,836 ----
  		newClass = getVarOrDirectWord(0x80);
  		if (newClass == 0) {
! 			_classData[act] = 0;
! 			if( _features & GF_SMALL_HEADER)
! 			{
! 				Actor *a;
! 				a=derefActor(act);
! 				a->forceClip=0;
! 			}
! 				
  			continue;
  		}