[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.231,1.232 script_v6.cpp,1.305,1.306

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9351/scumm

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

FT/DIG/COMI should always default to 100 for actor.forceclip.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- actor.cpp	17 Feb 2004 00:40:51 -0000	1.231
+++ actor.cpp	18 Feb 2004 04:21:18 -0000	1.232
@@ -102,7 +102,7 @@
 	animSpeed = 0;
 
 	ignoreBoxes = false;
-	forceClip = 0;
+	forceClip = (_vm->_version >= 7) ? 100 : 0;
 	ignoreTurns = false;
 	flip = 0;
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- script_v6.cpp	17 Feb 2004 00:13:25 -0000	1.305
+++ script_v6.cpp	18 Feb 2004 04:21:19 -0000	1.306
@@ -1846,19 +1846,13 @@
 		break;
 	case 95:		// SO_IGNORE_BOXES
 		a->ignoreBoxes = 1;
-		if (_version >= 7)
-			a->forceClip = 100;
-		else
-			a->forceClip = 0;
+		a->forceClip = (_version >= 7) ? 100 : 0;
 		if (a->isInCurrentRoom())
 			a->putActor(a->_pos.x, a->_pos.y, a->room);
 		break;
 	case 96:		// SO_FOLLOW_BOXES
 		a->ignoreBoxes = 0;
-		if (_version >= 7)
-			a->forceClip = 100;
-		else
-			a->forceClip = 0;
+		a->forceClip = (_version >= 7) ? 100 : 0;
 		if (a->isInCurrentRoom())
 			a->putActor(a->_pos.x, a->_pos.y, a->room);
 		break;