[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.12,2.13 script_v6.cpp,1.16,1.17 script_v8.cpp,2.21,2.22

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv23234

Modified Files:
	intern.h script_v6.cpp script_v8.cpp 
Log Message:
more V8 opcodes (mostly rerouting to V6 ones)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- intern.h	23 Dec 2002 20:25:47 -0000	2.12
+++ intern.h	24 Dec 2002 00:41:58 -0000	2.13
@@ -361,7 +361,7 @@
 	void o6_kernelFunction();
 	void o6_getAnimateVariable();
 	void o6_drawBlastObject();
-	void o6_getActorPriority();
+	void o6_getActorLayer();
 	void o6_unknownCD();
 	void o6_bor();
 	void o6_band();

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- script_v6.cpp	23 Dec 2002 18:56:43 -0000	1.16
+++ script_v6.cpp	24 Dec 2002 00:41:58 -0000	1.17
@@ -337,7 +337,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		/* EC */
-		OPCODE(o6_getActorPriority),
+		OPCODE(o6_getActorLayer),
 		OPCODE(o6_getObjectNewDir),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -1223,7 +1223,11 @@
 
 void Scumm_v6::o6_getActorMoving()
 {
-	push(derefActorSafe(pop(), "o6_getActorMoving")->moving);
+	Actor *a = derefActorSafe(pop(), "o6_getActorMoving");
+	if (a)
+		push(a->moving);
+	else
+		push(0);
 }
 
 void Scumm_v6::o6_isScriptRunning()
@@ -1238,7 +1242,11 @@
 
 void Scumm_v6::o6_getActorRoom()
 {
-	push(derefActorSafe(pop(), "o6_getActorRoom")->room);
+	Actor *a = derefActorSafe(pop(), "o6_getActorRoom");
+	if (a)
+		push(a->room);
+	else
+		push(0);
 }
 
 void Scumm_v6::o6_getObjectX()
@@ -2875,11 +2883,11 @@
 	push(i);
 }
 
-void Scumm_v6::o6_getActorPriority()
+void Scumm_v6::o6_getActorLayer()
 {
 	Actor *a;
 
-	a = derefActorSafe(pop(), "getActorPriority");
+	a = derefActorSafe(pop(), "getActorLayer");
 
 	push(a->layer);
 }

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- script_v8.cpp	23 Dec 2002 23:53:29 -0000	2.21
+++ script_v8.cpp	24 Dec 2002 00:41:59 -0000	2.22
@@ -291,8 +291,8 @@
 		/* C8 */
 		OPCODE(o6_startScript),
 		OPCODE(o6_startObject),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_pickOneOf),
+		OPCODE(o6_pickOneOfDefault),
 		/* CC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),
@@ -317,27 +317,27 @@
 		OPCODE(o6_findObject),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_findInventory),
 		/* E0 */
+		OPCODE(o6_getInventoryCount),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_getActorRoom),
+		OPCODE(o6_getActorWalkBox),
 		/* E4 */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_getActorMoving),
+		OPCODE(o6_getActorCostume),
+		OPCODE(o6_getActorScaleX),
+		OPCODE(o6_getActorLayer),
 		/* E8 */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_getActorElevation),
+		OPCODE(o6_getActorWidth),
+		OPCODE(o6_getObjectNewDir),		// FIXME: is this right?
+		OPCODE(o6_getObjectX),
 		/* EC */
+		OPCODE(o6_getObjectY),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_distObjectObject),
+		OPCODE(o6_distPtPt),
 		/* F0 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -1004,7 +1004,11 @@
 	byte subOp = fetchScriptByte();
 	switch (subOp) {
 	case 0x32:		// SO_CAMERA_PAUSE
+		warning("freezeCamera NYI");
+		break;
 	case 0x33:		// SO_CAMERA_RESUME
+		warning("unfreezeCamera NYI");
+		break;
 	default:
 		error("o8_cameraOps: default case %d", subOp);
 	}