[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.60,1.61

[James Brown]

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

Modified Files:
	actor.cpp 
Log Message:
Fix mystery vortex freeze.



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- actor.cpp	10 May 2002 15:43:50 -0000	1.60
+++ actor.cpp	10 May 2002 16:08:22 -0000	1.61
@@ -322,6 +322,7 @@
 	byte *resptr;
 	int y;
 
+
 	if (_features & GF_NO_SCALLING) {
 		a->scalex = 0xFF;
 		a->scaley = 0xFF;
@@ -331,6 +332,9 @@
 	if (a->ignoreBoxes != 0)
 		return;
 
+	if(getBoxFlags(a->walkbox) & 0x20)
+		return;
+
 	scale = getBoxScale(a->walkbox);
 
 	if (scale & 0x8000) {
@@ -913,9 +917,9 @@
 		if (a == NULL || !a->needRedraw)
 			return;
 		
-		if (g_scumm->getClass(a->number, 20))
+		if (getClass(a->number, 20))
 			a->mask = 0;
-		else if (g_scumm->getClass(a->number, 21))
+		else if (getClass(a->number, 21))
 			a->forceClip = 1;
 
 		if (_gameId==GID_SAMNMAX && getState(995)) // FIXME: ugly fix for samnmax inventory