[Scummvm-cvs-logs] SF.net SVN: scummvm: [24115] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 24115
          http://svn.sourceforge.net/scummvm/?rev=24115&view=rev
Author:   fingolfin
Date:     2006-10-04 13:22:14 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
o2_animateActor is essentially identical to o5_animateActor -- removed in favor of the latter

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/script_v2.cpp

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-10-04 20:20:50 UTC (rev 24114)
+++ scummvm/trunk/engines/scumm/intern.h	2006-10-04 20:22:14 UTC (rev 24115)
@@ -323,7 +323,6 @@
 	void o2_actorOps();
 	void o2_add();
 	void o2_addIndirect();
-	void o2_animateActor();
 	void o2_assignVarByte();
 	void o2_assignVarWordIndirect();
 	void o2_beginOverride();

Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-04 20:20:50 UTC (rev 24114)
+++ scummvm/trunk/engines/scumm/script_v2.cpp	2006-10-04 20:22:14 UTC (rev 24115)
@@ -59,7 +59,7 @@
 		OPCODE(o2_ifNotState08),
 		/* 10 */
 		OPCODE(o5_getObjectOwner),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o2_actorOps),
 		/* 14 */
@@ -139,7 +139,7 @@
 		OPCODE(o2_ifState08),
 		/* 50 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o2_actorOps),
 		/* 54 */
@@ -219,7 +219,7 @@
 		OPCODE(o2_ifNotState08),
 		/* 90 */
 		OPCODE(o5_getObjectOwner),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o2_actorOps),
 		/* 94 */
@@ -299,7 +299,7 @@
 		OPCODE(o2_ifState08),
 		/* D0 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o2_actorOps),
 		/* D4 */
@@ -1262,14 +1262,6 @@
 	a->setElevation(elevation * 2);
 }
 
-void ScummEngine_v2::o2_animateActor() {
-	int act = getVarOrDirectByte(PARAM_1);
-	int anim = getVarOrDirectByte(PARAM_2);
-
-	Actor *a = derefActor(act, "o2_animateActor");
-	a->animateActor(anim);
-}
-
 void ScummEngine_v2::o2_actorFromPos() {
 	int x, y;
 	getResultPos();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.