From bd7d05dae60578c68183fa591974f010a578b2b3 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 3 Mar 2006 23:52:48 +0000
Subject: Update opcodes for C64 maniac

svn-id: r21051
---
 engines/scumm/intern.h       |  6 +++---
 engines/scumm/script_c64.cpp | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 47ba1123ae..7d5cdab07a 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -442,8 +442,8 @@ protected:
 	void o_putActorAtObject();
 	void o_pickupObject();
 	void o_lockSound();
-	void o_lockActor();
-	void o_loadActor();
+	void o_lockCostume();
+	void o_loadCostume();
 	void o_loadRoom();
 	void o_loadRoomWithEgo();
 	void o_lockScript();
@@ -451,7 +451,7 @@ protected:
 	void o_lockRoom();
 	void o_cursorCommand();
 	void o_lights();
-	void o_unlockActor();
+	void o_unlockCostume();
 	void o_unlockScript();
 	void o_decrement();
 	void o_badOpcode();
diff --git a/engines/scumm/script_c64.cpp b/engines/scumm/script_c64.cpp
index 39ac69ce74..db4c6e70b7 100644
--- a/engines/scumm/script_c64.cpp
+++ b/engines/scumm/script_c64.cpp
@@ -59,7 +59,7 @@ void ScummEngine_c64::setupOpcodes() {
 		OPCODE(o5_breakHere),
 		OPCODE(o_animateActor),
 		OPCODE(o2_panCameraTo),
-		OPCODE(o_lockActor),
+		OPCODE(o_lockCostume),
 		/* 14 */
 		OPCODE(o_print_c64),
 		OPCODE(o5_walkActorToActor),
@@ -96,7 +96,7 @@ void ScummEngine_c64::setupOpcodes() {
 		OPCODE(o_print_c64),
 		OPCODE(o2_ifState08),
 		/* 30 */
-		OPCODE(o_loadActor),
+		OPCODE(o_loadCostume),
 		OPCODE(o_getBitVar),
 		OPCODE(o2_setCameraAt),
 		OPCODE(o_lockScript),
@@ -219,7 +219,7 @@ void ScummEngine_c64::setupOpcodes() {
 		OPCODE(o_pickupObject),
 		OPCODE(o_animateActor),
 		OPCODE(o2_panCameraTo),
-		OPCODE(o_unlockActor),
+		OPCODE(o_unlockCostume),
 		/* 94 */
 		OPCODE(o5_print),
 		OPCODE(o2_actorFromPos),
@@ -256,7 +256,7 @@ void ScummEngine_c64::setupOpcodes() {
 		OPCODE(o_print_c64),
 		OPCODE(o2_ifNotState08),
 		/* B0 */
-		OPCODE(o_loadActor),
+		OPCODE(o_loadCostume),
 		OPCODE(o_getBitVar),
 		OPCODE(o2_setCameraAt),
 		OPCODE(o_unlockScript),
@@ -590,16 +590,19 @@ void ScummEngine_c64::o_unlockSound() {
 	res.unlock(rtSound, resid);
 }
 
-void ScummEngine_c64::o_loadActor() {
-	debug(0, "o_loadActor (%d)", getVarOrDirectByte(PARAM_1));
+void ScummEngine_c64::o_loadCostume() {
+	int resid = getVarOrDirectByte(PARAM_1);
+	ensureResourceLoaded(rtCostume, resid);
 }
 
-void ScummEngine_c64::o_lockActor() {
-	debug(0, "o_lockActor (%d)", fetchScriptByte());
+void ScummEngine_c64::o_lockCostume() {
+	int resid = fetchScriptByte();
+	res.lock(rtCostume, resid);
 }
 
-void ScummEngine_c64::o_unlockActor() {
-	debug(0, "o_unlockActor (%d)", fetchScriptByte());
+void ScummEngine_c64::o_unlockCostume() {
+	int resid = fetchScriptByte();
+	res.unlock(rtCostume, resid);
 }
 
 void ScummEngine_c64::o_loadScript() {
-- 
cgit v1.2.3