[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.32,1.33

James Brown ender at users.sourceforge.net
Fri Nov 22 00:15:01 CET 2002


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

Modified Files:
	actor.cpp 
Log Message:
Apply patch 642171. Fixes some Loom and FOA bugs. Regression testing doesn't reveil any hangs 
introduced, but watch out for minor actor movement regressions.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- actor.cpp	18 Nov 2002 00:35:21 -0000	1.32
+++ actor.cpp	22 Nov 2002 08:14:33 -0000	1.33
@@ -724,12 +724,8 @@
 	moving &= ~MF_TURN;
 
 	if (newdir != facing) {
-		moving = MF_TURN;
+		moving |= MF_TURN;
 		newDirection = newdir;
-
-		// FIXME - workaround for bug #558236
-		if (_vm->_gameId == GID_INDY4 && room == 39 && x == 617 && y == 125 && newdir == 180)
-			startAnimActor(standFrame);
 	}
 }
 





More information about the Scummvm-git-logs mailing list