[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.14,2.15 script_v8.cpp,2.26,2.27

[Max Horn]

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

Modified Files:
	intern.h script_v8.cpp 
Log Message:
more opcodes (we see graphics again, albeit only briefly before it crashes)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- intern.h	24 Dec 2002 23:26:37 -0000	2.14
+++ intern.h	25 Dec 2002 00:04:12 -0000	2.15
@@ -418,6 +418,7 @@
 	void o8_printCursor();
 	void o8_printDebug();
 	void o8_printSystem();
+	void o8_blastText();
 
 	void o8_cursorCommand();
 	void o8_resourceRoutines();
@@ -430,6 +431,11 @@
 	void o8_system();
 	void o8_kludge();
 	void o8_kludge2();
+
+	void o8_getObjectImageX();
+	void o8_getObjectImageY();
+	void o8_getObjectImageWidth();
+	void o8_getObjectImageHeight();
 };
 
 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -d -r2.26 -r2.27
--- script_v8.cpp	24 Dec 2002 23:26:37 -0000	2.26
+++ script_v8.cpp	25 Dec 2002 00:04:12 -0000	2.27
@@ -214,9 +214,9 @@
 		OPCODE(o6_setState),
 		OPCODE(o6_setOwner),
 		/* 8C */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_panCameraTo),
+		OPCODE(o6_actorFollowCamera),
+		OPCODE(o6_setCameraAt),
 		OPCODE(o6_invalid),
 		/* 90 */
 		OPCODE(o6_invalid),
@@ -227,7 +227,7 @@
 		OPCODE(o8_printCursor),
 		OPCODE(o8_printDebug),
 		OPCODE(o8_printSystem),
-		OPCODE(o6_invalid),
+		OPCODE(o8_blastText),
 		/* 98 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -339,10 +339,10 @@
 		OPCODE(o6_distObjectObject),
 		OPCODE(o6_distPtPt),
 		/* F0 */
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o8_getObjectImageX),
+		OPCODE(o8_getObjectImageY),
+		OPCODE(o8_getObjectImageWidth),
+		OPCODE(o8_getObjectImageHeight),
 		/* F4 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -645,24 +645,34 @@
 
 void Scumm_v8::o8_printLine()
 {
+	// FIXME
 	decodeParseString(0, 0);
 }
 
 void Scumm_v8::o8_printCursor()
 {
+	// FIXME
 	decodeParseString(1, 0);
 }
 
 void Scumm_v8::o8_printDebug()
 {
+	// FIXME
 	decodeParseString(2, 0);
 }
 
 void Scumm_v8::o8_printSystem()
 {
+	// FIXME
 	decodeParseString(3, 0);
 }
 
+void Scumm_v8::o8_blastText()
+{
+	// FIXME
+	decodeParseString(2, 0);
+}
+
 void Scumm_v8::o8_cursorCommand()
 {
 	// TODO
@@ -1169,6 +1179,31 @@
 		warning("o8_kludge2: default case %d", args[0]);
 	}
 }
+
+void Scumm_v8::o8_getObjectImageX()
+{
+	int i = getObjectIndex(pop());
+	push(_objs[i].x_pos);
+}
+
+void Scumm_v8::o8_getObjectImageY()
+{
+	int i = getObjectIndex(pop());
+	push(_objs[i].y_pos);
+}
+
+void Scumm_v8::o8_getObjectImageWidth()
+{
+	int i = getObjectIndex(pop());
+	push(_objs[i].width);
+}
+
+void Scumm_v8::o8_getObjectImageHeight()
+{
+	int i = getObjectIndex(pop());
+	push(_objs[i].height);
+}
+
 
 /*