From f7eee205bb6133fb5a65d95c12caa31e1a26d272 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 4 Oct 2006 20:22:14 +0000
Subject: o2_animateActor is essentially identical to o5_animateActor --
 removed in favor of the latter

svn-id: r24115
---
 engines/scumm/intern.h      |  1 -
 engines/scumm/script_v2.cpp | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 716c1a9691..c3989f6938 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -323,7 +323,6 @@ protected:
 	void o2_actorOps();
 	void o2_add();
 	void o2_addIndirect();
-	void o2_animateActor();
 	void o2_assignVarByte();
 	void o2_assignVarWordIndirect();
 	void o2_beginOverride();
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 472c6dc41f..5fb6956a3a 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -59,7 +59,7 @@ void ScummEngine_v2::setupOpcodes() {
 		OPCODE(o2_ifNotState08),
 		/* 10 */
 		OPCODE(o5_getObjectOwner),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o2_actorOps),
 		/* 14 */
@@ -139,7 +139,7 @@ void ScummEngine_v2::setupOpcodes() {
 		OPCODE(o2_ifState08),
 		/* 50 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o2_actorOps),
 		/* 54 */
@@ -219,7 +219,7 @@ void ScummEngine_v2::setupOpcodes() {
 		OPCODE(o2_ifNotState08),
 		/* 90 */
 		OPCODE(o5_getObjectOwner),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o2_panCameraTo),
 		OPCODE(o2_actorOps),
 		/* 94 */
@@ -299,7 +299,7 @@ void ScummEngine_v2::setupOpcodes() {
 		OPCODE(o2_ifState08),
 		/* D0 */
 		OPCODE(o2_pickupObject),
-		OPCODE(o2_animateActor),
+		OPCODE(o5_animateActor),
 		OPCODE(o5_actorFollowCamera),
 		OPCODE(o2_actorOps),
 		/* D4 */
@@ -1262,14 +1262,6 @@ void ScummEngine_v2::o2_setActorElevation() {
 	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();
-- 
cgit v1.2.3