[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.318,2.319 script_v100he.cpp,2.29,2.30 script_v72he.cpp,2.187,2.188 script_v80he.cpp,2.65,2.66 script_v90he.cpp,2.113,2.114

[Travis Howell]

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

Modified Files:
	intern.h script_v100he.cpp script_v72he.cpp script_v80he.cpp 
	script_v90he.cpp 
Log Message:

Revert opcode EF merge, HE72 uses different array structure.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.318
retrieving revision 2.319
diff -u -d -r2.318 -r2.319
--- intern.h	26 Nov 2004 20:17:02 -0000	2.318
+++ intern.h	27 Nov 2004 02:47:45 -0000	2.319
@@ -774,6 +774,7 @@
 	void o72_pickVarRandom();
 	void o72_redimArray();
 	void o72_copyString();
+	void o72_appendString();
 	void o72_concatString();
 	void o72_checkGlobQueue();
 	void o72_readINI();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.29
retrieving revision 2.30
diff -u -d -r2.29 -r2.30
--- script_v100he.cpp	26 Nov 2004 20:17:02 -0000	2.29
+++ script_v100he.cpp	27 Nov 2004 02:47:45 -0000	2.30
@@ -326,7 +326,7 @@
 		/* E0 */
 		OPCODE(o70_compareString),
 		OPCODE(o72_copyString),
-		OPCODE(o70_appendString),
+		OPCODE(o72_appendString),
 		OPCODE(o72_concatString),
 		/* E4 */
 		OPCODE(o70_getStringLen),

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.187
retrieving revision 2.188
diff -u -d -r2.187 -r2.188
--- script_v72he.cpp	26 Nov 2004 20:17:02 -0000	2.187
+++ script_v72he.cpp	27 Nov 2004 02:47:45 -0000	2.188
@@ -343,7 +343,7 @@
 		OPCODE(o72_copyString),
 		OPCODE(o70_getStringWidth),
 		OPCODE(o70_getStringLen),
-		OPCODE(o70_appendString),
+		OPCODE(o72_appendString),
 		/* F0 */
 		OPCODE(o72_concatString),
 		OPCODE(o70_compareString),
@@ -2384,6 +2384,27 @@
 	debug(1,"stub o72_copyString");
 }
 
+void ScummEngine_v72he::o72_appendString() {
+	int dst, size;
+
+	int len = pop();
+	int srcOffs = pop();
+	int src = pop();
+
+	size = len - srcOffs + 2;
+
+	writeVar(0, 0);
+	defineArray(0, kStringArray, 0, 0, 0, size);
+	writeArray(0, 0, 0, 0);
+
+	dst = readVar(0);
+
+	appendSubstring(dst, src, srcOffs, len);
+
+	push(dst);
+	debug(1,"stub o72_appendString");
+}
+
 void ScummEngine_v72he::o72_concatString() {
 	int dst, size;
 

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.65
retrieving revision 2.66
diff -u -d -r2.65 -r2.66
--- script_v80he.cpp	26 Nov 2004 20:17:02 -0000	2.65
+++ script_v80he.cpp	27 Nov 2004 02:47:46 -0000	2.66
@@ -342,7 +342,7 @@
 		OPCODE(o72_copyString),
 		OPCODE(o70_getStringWidth),
 		OPCODE(o70_getStringLen),
-		OPCODE(o70_appendString),
+		OPCODE(o72_appendString),
 		/* F0 */
 		OPCODE(o72_concatString),
 		OPCODE(o70_compareString),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.113
retrieving revision 2.114
diff -u -d -r2.113 -r2.114
--- script_v90he.cpp	26 Nov 2004 20:17:02 -0000	2.113
+++ script_v90he.cpp	27 Nov 2004 02:47:46 -0000	2.114
@@ -342,7 +342,7 @@
 		OPCODE(o72_copyString),
 		OPCODE(o70_getStringWidth),
 		OPCODE(o70_getStringLen),
-		OPCODE(o70_appendString),
+		OPCODE(o72_appendString),
 		/* F0 */
 		OPCODE(o72_concatString),
 		OPCODE(o70_compareString),