[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.200,1.201 script_v6.cpp,1.248,1.249

[Travis Howell]

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

Modified Files:
	actor.cpp script_v6.cpp 
Log Message:

Add another check for ignoreTurns, ignoreTurns.
Should be complete for scumm7 games


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- actor.cpp	6 Jan 2004 12:45:29 -0000	1.200
+++ actor.cpp	7 Jan 2004 06:08:54 -0000	1.201
@@ -302,7 +302,7 @@
 	int dir;
 	bool shouldInterpolate;
 
-	if (ignoreTurns)
+	if ((_vm->_version == 6) && ignoreTurns)
 		return facing;
 
 	dirType = (_vm->_features & GF_NEW_COSTUMES) ? _vm->akos_hasManyDirections(costume) : false;
@@ -723,7 +723,7 @@
 }
 
 void Actor::turnToDirection(int newdir) {
-	if (newdir == -1)
+	if (newdir == -1 || ignoreTurns)
 		return;
 
 	moving &= ~MF_TURN;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- script_v6.cpp	7 Jan 2004 05:51:56 -0000	1.248
+++ script_v6.cpp	7 Jan 2004 06:08:54 -0000	1.249
@@ -1764,7 +1764,7 @@
 		a->setAnimVar(pop(), i);
 		break;
 	case 215:		// SO_ACTOR_IGNORE_TURNS_ON
-		warning("ignoreTurns not yet implemented");
+		warning("ignoreTurns partially implemented");
 		a->ignoreTurns = true;
 		break;
 	case 216:		// SO_ACTOR_IGNORE_TURNS_OFF