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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Mar 3 15:53:01 CET 2006


Revision: 21051
Author:   kirben
Date:     2006-03-03 15:52:48 -0800 (Fri, 03 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=21051&view=rev

Log Message:
-----------
Update opcodes for C64 maniac

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/script_c64.cpp
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-03-03 23:51:51 UTC (rev 21050)
+++ scummvm/trunk/engines/scumm/intern.h	2006-03-03 23:52:48 UTC (rev 21051)
@@ -442,8 +442,8 @@
 	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 @@
 	void o_lockRoom();
 	void o_cursorCommand();
 	void o_lights();
-	void o_unlockActor();
+	void o_unlockCostume();
 	void o_unlockScript();
 	void o_decrement();
 	void o_badOpcode();

Modified: scummvm/trunk/engines/scumm/script_c64.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_c64.cpp	2006-03-03 23:51:51 UTC (rev 21050)
+++ scummvm/trunk/engines/scumm/script_c64.cpp	2006-03-03 23:52:48 UTC (rev 21051)
@@ -59,7 +59,7 @@
 		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 @@
 		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 @@
 		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 @@
 		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 @@
 	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() {







More information about the Scummvm-git-logs mailing list