[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.120,2.121 script_v2.cpp,2.210,2.211

[Pawel Kolodziejski]

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

Modified Files:
	intern.h script_v2.cpp 
Log Message:
changed opcode name to actorOps

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.120
retrieving revision 2.121
diff -u -d -r2.120 -r2.121
--- intern.h	10 Nov 2003 08:00:51 -0000	2.120
+++ intern.h	10 Nov 2003 08:46:40 -0000	2.121
@@ -226,7 +226,7 @@
 
 	/* Version 2 script opcodes */
 	void o2_actorFromPos();
-	void o2_actorSet();
+	void o2_actorOps();
 	void o2_add();
 	void o2_addIndirect();
 	void o2_animateActor();

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.210
retrieving revision 2.211
diff -u -d -r2.210 -r2.211
--- script_v2.cpp	8 Nov 2003 21:59:32 -0000	2.210
+++ script_v2.cpp	10 Nov 2003 08:46:40 -0000	2.211
@@ -59,7 +59,7 @@
 		OPCODE(o5_getObjectOwner),
 		OPCODE(o2_animateActor),
 		OPCODE(o2_panCameraTo),
-		OPCODE(o2_actorSet),
+		OPCODE(o2_actorOps),
 		/* 14 */
 		OPCODE(o5_print),
 		OPCODE(o2_actorFromPos),
@@ -139,7 +139,7 @@
 		OPCODE(o2_pickupObject),
 		OPCODE(o2_animateActor),
 		OPCODE(o5_actorFollowCamera),
-		OPCODE(o2_actorSet),
+		OPCODE(o2_actorOps),
 		/* 54 */
 		OPCODE(o2_setObjectName),
 		OPCODE(o2_actorFromPos),
@@ -219,7 +219,7 @@
 		OPCODE(o5_getObjectOwner),
 		OPCODE(o2_animateActor),
 		OPCODE(o2_panCameraTo),
-		OPCODE(o2_actorSet),
+		OPCODE(o2_actorOps),
 		/* 94 */
 		OPCODE(o5_print),
 		OPCODE(o2_actorFromPos),
@@ -299,7 +299,7 @@
 		OPCODE(o2_pickupObject),
 		OPCODE(o2_animateActor),
 		OPCODE(o5_actorFollowCamera),
-		OPCODE(o2_actorSet),
+		OPCODE(o2_actorOps),
 		/* D4 */
 		OPCODE(o2_setObjectName),
 		OPCODE(o2_actorFromPos),
@@ -662,7 +662,7 @@
 	o5_breakHere();
 }
 
-void ScummEngine_v2::o2_actorSet() {
+void ScummEngine_v2::o2_actorOps() {
 	int act = getVarOrDirectByte(0x80);
 	int arg = getVarOrDirectByte(0x40);
 	Actor *a;
@@ -703,7 +703,7 @@
 			a->talkColor = arg;
 		break;
 	default:
-		warning("o2_actorSet: opcode %d not yet supported", _opcode);
+		warning("o2_actorOps: opcode %d not yet supported", _opcode);
 	}
 }