[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.99,1.100 actor.h,1.14,1.15

Max Horn fingolfin at users.sourceforge.net
Fri Jul 26 09:51:03 CEST 2002


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

Modified Files:
	actor.cpp actor.h 
Log Message:
fixed Monkey CD problem caused by my recent checkin

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- actor.cpp	26 Jul 2002 16:13:04 -0000	1.99
+++ actor.cpp	26 Jul 2002 16:50:41 -0000	1.100
@@ -274,7 +274,6 @@
 void Actor::setBox(int box)
 {
 	walkbox = box;
-	mask = _vm->getMaskFromBox(box);
 
 	setupActorScale();
 }
@@ -869,15 +868,14 @@
 
 		cr._outheight = _vm->virtscr->height;
 
-		if (isInClass(20))
-			mask = 0;
-		forceClip = isInClass(21) ? 1 : 0;
+		cr._zbuf = _vm->getMaskFromBox(walkbox);
 
-		cr._zbuf = mask;
-		if (cr._zbuf > _vm->gdi._numZBuffer)
-			cr._zbuf = (byte)_vm->gdi._numZBuffer;
 		if (forceClip)
-			cr._zbuf = forceClip;
+			cr._zbuf = 1;
+		else if (isInClass(20))
+			cr._zbuf = 0;
+		else if (cr._zbuf > _vm->gdi._numZBuffer)
+			cr._zbuf = (byte)_vm->gdi._numZBuffer;
 
 		cr._shadow_table = _vm->_shadowPalette;
 
@@ -903,7 +901,7 @@
 		ar.scale_y = scaley;
 		ar.clipping = forceClip;
 		if (ar.clipping == 100) {
-			ar.clipping = mask;
+			ar.clipping = _vm->getMaskFromBox(walkbox);
 			if (ar.clipping > (byte)_vm->gdi._numZBuffer)
 				ar.clipping = _vm->gdi._numZBuffer;
 		}
@@ -1259,7 +1257,6 @@
 			return;
 
 		walkbox = walkdata.destbox;
-		mask = _vm->getMaskFromBox(walkbox);
 		goto restart;
 
 	}
@@ -1294,7 +1291,6 @@
 	}
 
 	walkbox = walkdata.curbox;
-	mask = _vm->getMaskFromBox(walkbox);
 	moving &= MF_IN_LEG;
 	moving |= MF_NEW_LEG;
 	goto restart;
@@ -1398,6 +1394,7 @@
 	case 20:	// Never clip
 		break;
 	case 21:	// Always clip
+		forceClip = value;
 		break;
 	case 22:	// Ignore boxes
 		ignoreBoxes = value;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- actor.h	26 Jul 2002 16:13:04 -0000	1.14
+++ actor.h	26 Jul 2002 16:50:41 -0000	1.15
@@ -91,7 +91,7 @@
 	uint speedx, speedy;
 	byte frame;
 	byte walkbox;
-	byte mask;
+	byte mask;	// This field is *NOT* used anymore, only kept around to make saveload.cpp happy
 	byte animProgress, animSpeed;
 	int16 new_1, new_2;
 	uint16 talk_script, walk_script;





More information about the Scummvm-git-logs mailing list