[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.496,2.497 script_c64.cpp,2.7,2.8

[kirben]

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

Modified Files:
	intern.h script_c64.cpp 
Log Message:

Add more opcode differences in C64 maniac.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.496
retrieving revision 2.497
diff -u -d -r2.496 -r2.497
--- intern.h	20 May 2005 06:39:18 -0000	2.496
+++ intern.h	20 May 2005 06:47:57 -0000	2.497
@@ -408,6 +408,7 @@
 	void o_getDist();
 	void o_isNotEqual();
 	void o_loadSound();
+	void o_animateActor();
 	void o_putActorAtObject();
 	void o_unknown13();
 	void o_clearState08();

Index: script_c64.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_c64.cpp,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- script_c64.cpp	20 May 2005 06:39:18 -0000	2.7
+++ script_c64.cpp	20 May 2005 06:47:57 -0000	2.8
@@ -57,7 +57,7 @@
 		OPCODE(o2_ifNotState08),
 		/* 10 */
 		OPCODE(o5_breakHere),
-		OPCODE(o2_animateActor),
+		OPCODE(o_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o_unknown13),
 		/* 14 */
@@ -137,7 +137,7 @@
 		OPCODE(o2_ifState08),
 		/* 50 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o_unknown53),
 		/* 54 */
@@ -217,7 +217,7 @@
 		OPCODE(o2_ifNotState08),
 		/* 90 */
 		OPCODE(o_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o_unknown93),
 		/* 94 */
@@ -297,7 +297,7 @@
 		OPCODE(o2_ifState08),
 		/* D0 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o2_actorOps),
 		/* D4 */
@@ -643,6 +643,16 @@
 	runInventoryScript(1);
 }
 
+void ScummEngine_c64::o_animateActor() {
+	int act = getVarOrDirectByte(PARAM_1);
+	int anim = getVarOrDirectByte(PARAM_2);
+	int unk = fetchScriptByte();
+	debug(0,"o_animateActor: unk %d", unk);
+
+	Actor *a = derefActor(act, "o_animateActor");
+	a->animateActor(anim);
+}
+
 void ScummEngine_c64::o_putActorAtObject() {
 	int obj, x, y;
 	Actor *a;