[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.207,1.208

Travis Howell kirben at users.sourceforge.net
Sun Jan 11 01:00:01 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28823/scumm

Modified Files:
	actor.cpp 
Log Message:

Ooops


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- actor.cpp	11 Jan 2004 08:39:39 -0000	1.207
+++ actor.cpp	11 Jan 2004 08:59:51 -0000	1.208
@@ -963,10 +963,10 @@
 	bcr->setPalette(palette);
 	bcr->setFacing(this);
 
-	if (_vm->_features & GF_NEW_COSTUMES) {
+	if ((_vm->_features & GF_NEW_COSTUMES) && !(_vm->_features & GF_HUMONGOUS)) {
 
 		bcr->_zbuf = forceClip;
-		if ((bcr->_zbuf == 100) || ((_vm->_features & GF_HUMONGOUS) && (bcr->_zbuf == 0))) {
+		if (bcr->_zbuf == 100) {
 			bcr->_zbuf = _vm->getMaskFromBox(walkbox);
 			if (bcr->_zbuf > _vm->gdi._numZBuffer-1)
 				bcr->_zbuf = _vm->gdi._numZBuffer-1;





More information about the Scummvm-git-logs mailing list