[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.440,2.441 script_v100he.cpp,2.123,2.124 script_v90he.cpp,2.225,2.226

[Gregory Montoir]

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

Modified Files:
	intern.h script_v100he.cpp script_v90he.cpp 
Log Message:
Updated comment

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.440
retrieving revision 2.441
diff -u -d -r2.440 -r2.441
--- intern.h	13 Apr 2005 10:40:06 -0000	2.440
+++ intern.h	13 Apr 2005 19:48:48 -0000	2.441
@@ -1100,7 +1100,7 @@
 	void o90_cond();
 	void o90_dim2dim2Array();
 	void o90_redim2dimArray();
-	void o90_unknown39();
+	void o90_getLinesIntersectionPoint();
 	void o90_sortArray();
 	void o90_getObjectData();
 	void o90_getPaletteData();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.123
retrieving revision 2.124
diff -u -d -r2.123 -r2.124
--- script_v100he.cpp	13 Apr 2005 10:34:34 -0000	2.123
+++ script_v100he.cpp	13 Apr 2005 19:48:49 -0000	2.124
@@ -264,7 +264,7 @@
 		/* B0 */
 		OPCODE(o72_findObjectWithClassOf),
 		OPCODE(o70_polygonHit),
-		OPCODE(o90_unknown39),
+		OPCODE(o90_getLinesIntersectionPoint),
 		OPCODE(o6_invalid),
 		/* B4 */
 		OPCODE(o72_getNumFreeArrays),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.225
retrieving revision 2.226
diff -u -d -r2.225 -r2.226
--- script_v90he.cpp	13 Apr 2005 10:34:35 -0000	2.225
+++ script_v90he.cpp	13 Apr 2005 19:48:49 -0000	2.226
@@ -113,7 +113,7 @@
 		OPCODE(o90_dim2dim2Array),
 		/* 38 */
 		OPCODE(o90_redim2dimArray),
-		OPCODE(o90_unknown39),
+		OPCODE(o90_getLinesIntersectionPoint),
 		OPCODE(o90_sortArray),
 		OPCODE(o6_invalid),
 		/* 3C */
@@ -1968,22 +1968,24 @@
 	}
 }
 
-void ScummEngine_v90he::o90_unknown39() {
-	// TODO: Array related
-
-	int array1 = fetchScriptWord();
-	int array2 = fetchScriptWord();
-	int a2_dim1end = pop();
-	int a2_dim1start = pop();
-	int a2_dim2end = pop();
-	int a2_dim2start = pop();
-	int a1_dim1end = pop();
-	int a1_dim1start = pop();
-	int a1_dim2end = pop();
-	int a1_dim2start = pop();
-
-	push(1);
-	debug(1,"o90_unknown39 stub array1 %d (%d, %d, %d, %d) array2 %d (%d, %d, %d, %d)", array1, a2_dim2start, a2_dim2end, a2_dim1start, a2_dim1end, array2, a1_dim2start, a1_dim2end, a1_dim1start, a1_dim1end);
+void ScummEngine_v90he::o90_getLinesIntersectionPoint() {
+	int var_ix = fetchScriptWord();
+	int var_iy = fetchScriptWord();
+	int line2_y2 = pop();
+	int line2_x2 = pop();
+	int line2_y1 = pop();
+	int line2_x1 = pop();
+	int line1_y2 = pop();
+	int line1_x2 = pop();
+	int line1_y1 = pop();
+	int line1_x1 = pop();
+	
+	// XXX compute the intersection point of the 2 lines
+	writeVar(var_ix, 0);
+	writeVar(var_iy, 0);
+	push(0);
+	
+	debug(1, "o90_getLinesIntersectionPoint stub var_x=%d var y=%d line1=(%d,%d,%d,%d) line2=(%d,%d,%d,%d)", var_ix, var_iy, line1_x1, line1_y1, line1_x2, line1_y2, line2_x1, line2_y1, line2_x2, line2_y2);
 }
 
 void ScummEngine_v90he::getArrayDim(int array, int *dim2start, int *dim2end, int *dim1start, int *dim1end) {