[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.140,2.141 script_v6.cpp,1.75,1.76 actor.h,1.17,1.18

[Max Horn]

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

Modified Files:
	script_v8.cpp script_v6.cpp actor.h 
Log Message:
new constant MF_FROZEN; fixed actor unfreeze code

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.140
retrieving revision 2.141
diff -u -d -r2.140 -r2.141
--- script_v8.cpp	6 Mar 2003 21:46:21 -0000	2.140
+++ script_v8.cpp	8 Mar 2003 02:06:56 -0000	2.141
@@ -1155,10 +1155,10 @@
 		a->talk_script = pop();
 		break;
 	case 0x85:		// SO_ACTOR_WALK_PAUSE
-		a->moving |= 0x80;
+		a->moving |= MF_FROZEN;
 		break;
 	case 0x86:		// SO_ACTOR_WALK_RESUME
-		a->moving &= ~0x7f;
+		a->moving &= ~MF_FROZEN;
 		break;
 	case 0x87:		// SO_ACTOR_VOLUME Set volume of actor speech
 		// TODO - implement this!

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- script_v6.cpp	7 Mar 2003 21:54:45 -0000	1.75
+++ script_v6.cpp	8 Mar 2003 02:06:56 -0000	1.76
@@ -1712,10 +1712,10 @@
 		a->turnToDirection(pop());
 		break;
 	case 233:										/* freeze actor */
-		a->moving |= 0x80;
+		a->moving |= MF_FROZEN;
 		break;
 	case 234:										/* unfreeze actor */
-		a->moving &= ~0x7f;
+		a->moving &= ~MF_FROZEN;
 		break;
 	case 235:										/* talk_script */
 		a->talk_script = pop();

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- actor.h	7 Mar 2003 21:59:02 -0000	1.17
+++ actor.h	8 Mar 2003 02:06:56 -0000	1.18
@@ -32,7 +32,8 @@
 	MF_NEW_LEG = 1,
 	MF_IN_LEG = 2,
 	MF_TURN = 4,
-	MF_LAST_LEG = 8
+	MF_LAST_LEG = 8,
+	MF_FROZEN = 0x80
 };
 
 struct ActorWalkData {