[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.209,2.210 script_v72he.cpp,2.36,2.37 script_v7he.cpp,2.57,2.58

[Travis Howell]

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

Modified Files:
	intern.h script_v72he.cpp script_v7he.cpp 
Log Message:

Add HE 72 version


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.209
retrieving revision 2.210
diff -u -d -r2.209 -r2.210
--- intern.h	31 Aug 2004 07:40:28 -0000	2.209
+++ intern.h	31 Aug 2004 07:47:34 -0000	2.210
@@ -723,8 +723,9 @@
 	void o72_getPixel();
 	void o72_pickVarRandom();
 	void o72_redimArray();
-	void o72_readINI();
+	void o72_unknownEF();
 	void o72_unknownF1();
+	void o72_readINI();
 	void o72_unknownF4();
 	void o72_unknownF8();
 	void o72_unknownF9();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -d -r2.36 -r2.37
--- script_v72he.cpp	30 Aug 2004 11:52:33 -0000	2.36
+++ script_v72he.cpp	31 Aug 2004 07:47:34 -0000	2.37
@@ -334,7 +334,7 @@
 		OPCODE(o6_setBoxSet),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o7_unknownEF),
+		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_seekFilePos),
@@ -344,7 +344,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o7_stringLen),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o6_invalid),
 		OPCODE(o72_unknownF1),
@@ -1213,6 +1213,54 @@
 }
 
 
+void ScummEngine_v72he::o72_unknownEF() {
+	int value;
+	int array, array2, len, len2, len3, offset;
+	int b, size;
+	len = pop();
+	b = pop();
+	array2 = pop();
+
+	size = len - b + 2;
+
+	defineArray(0, kStringArray, 0, 0, 0, size);
+	writeArray(0, 0, 0, 0);
+
+	array = readVar(0);
+
+	len2 = len;
+	if (len == -1) {
+		len2 = resStrLen(getStringAddress(array2));
+		len = 0;
+	} else {
+		len = b;
+	}
+	len3 = resStrLen(getStringAddress(array));
+
+	offset = 0;
+	len2 -= len;
+	len2++;
+	while (offset < len2) {
+		writeVar(0, array2);
+		value = readArray(0, 0, offset + len);
+		writeVar(0, array);
+		writeArray(0, 0, offset + len3, value);
+		offset++;
+	}
+
+	writeArray(0, 0, len3 + offset, 0);
+
+	push(array);
+	debug(1,"stub o72_unknownEF (array %d, array2 %d)", array, array2);
+}
+
+void ScummEngine_v72he::o72_unknownF1() {
+	int a = pop();
+	int b = pop();
+	debug(1,"o7_unknownF1 stub (%d, %d)", b, a);
+	push(-1);
+}
+
 void ScummEngine_v72he::o72_readINI() {
 	byte name[100];
 	int type;
@@ -1237,13 +1285,6 @@
 	debug(1, "o72_readINI (%d) %s", type, name);
 }
 
-void ScummEngine_v72he::o72_unknownF1() {
-	int a = pop();
-	int b = pop();
-	debug(1,"o7_unknownF1 stub (%d, %d)", b, a);
-	push(-1);
-}
-
 void ScummEngine_v72he::o72_unknownF4() {
 	byte b;
 	byte name[256], name2[1024];

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.57
retrieving revision 2.58
diff -u -d -r2.57 -r2.58
--- script_v7he.cpp	31 Aug 2004 07:40:28 -0000	2.57
+++ script_v7he.cpp	31 Aug 2004 07:47:34 -0000	2.58
@@ -826,7 +826,6 @@
 
 	size = len - b + 2;
 
-
 	defineArray(0, kStringArray, 0, size);
 	writeArray(0, 0, 0, 0);