[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.522,2.523 script_c64.cpp,2.19,2.20

kirben kirben at users.sourceforge.net
Thu Sep 22 06:38:11 CEST 2005


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

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

Convert old actor moving states.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.522
retrieving revision 2.523
diff -u -d -r2.522 -r2.523
--- intern.h	14 Sep 2005 10:35:04 -0000	2.522
+++ intern.h	22 Sep 2005 13:34:20 -0000	2.523
@@ -422,6 +422,7 @@
 	void o_clearState08();
 	void o_stopCurrentScript();
 	void o_loadSound();
+	void o_getActorMoving();
 	void o_animateActor();
 	void o_putActorAtObject();
 	void o_unknown13();

Index: script_c64.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_c64.cpp,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -d -r2.19 -r2.20
--- script_c64.cpp	14 Sep 2005 10:35:04 -0000	2.19
+++ script_c64.cpp	22 Sep 2005 13:34:20 -0000	2.20
@@ -143,7 +143,7 @@
 		/* 54 */
 		OPCODE(o5_setObjectName),
 		OPCODE(o2_actorFromPos),
-		OPCODE(o5_getActorMoving),
+		OPCODE(o_getActorMoving),
 		OPCODE(o_clearState08),
 		/* 58 */
 		OPCODE(o_beginOverride),
@@ -303,7 +303,7 @@
 		/* D4 */
 		OPCODE(o5_setObjectName),
 		OPCODE(o2_actorFromPos),
-		OPCODE(o5_getActorMoving),
+		OPCODE(o_getActorMoving),
 		OPCODE(o_setState08),
 		/* D8 */
 		OPCODE(o_stopCurrentScript),
@@ -533,6 +533,16 @@
 	a->animateActor(anim);
 }
 
+void ScummEngine_c64::o_getActorMoving() {
+	getResultPos();
+	int act = getVarOrDirectByte(PARAM_1);
+	Actor *a = derefActor(act, "o_getActorMoving");
+	if (a->_moving)
+		setResult(1);
+	else
+		setResult(2);
+}
+
 void ScummEngine_c64::o_putActorAtObject() {
 	int obj, x, y;
 	Actor *a;





More information about the Scummvm-git-logs mailing list