[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.224,1.225 script_v6.cpp,1.282,1.283

[Travis Howell]

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

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

actor ignoreTurns is complete for scumm6


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- actor.cpp	22 Jan 2004 02:37:41 -0000	1.224
+++ actor.cpp	22 Jan 2004 03:22:01 -0000	1.225
@@ -1292,7 +1292,7 @@
 	if (!isInCurrentRoom()) {
 		_pos.x = abr.x;
 		_pos.y = abr.y;
-		if (dir != -1)
+		if (!(_vm->_version == 6 && ignoreTurns) && dir != -1)
 			setDirection(dir);
 		return;
 	}

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- script_v6.cpp	22 Jan 2004 02:37:41 -0000	1.282
+++ script_v6.cpp	22 Jan 2004 03:22:01 -0000	1.283
@@ -1897,7 +1897,6 @@
 		a->setAnimVar(pop(), i);
 		break;
 	case 215:		// SO_ACTOR_IGNORE_TURNS_ON
-		warning("ignoreTurns partially implemented");
 		a->ignoreTurns = true;
 		break;
 	case 216:		// SO_ACTOR_IGNORE_TURNS_OFF