[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.178,2.179 script_v6he.cpp,2.88,2.89 script_v7he.cpp,2.35,2.36

[Travis Howell]

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

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

Add opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.178
retrieving revision 2.179
diff -u -d -r2.178 -r2.179
--- intern.h	22 Aug 2004 23:37:59 -0000	2.178
+++ intern.h	23 Aug 2004 05:23:58 -0000	2.179
@@ -622,6 +622,7 @@
 	byte stringLen(byte *);
 
 	/* Version 7 script opcodes */
+	void o7_getString();
 	void o7_objectX();
 	void o7_objectY();
 	void o7_stringLen();


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- script_v7he.cpp	22 Aug 2004 23:38:00 -0000	2.35
+++ script_v7he.cpp	23 Aug 2004 05:23:58 -0000	2.36
@@ -57,7 +57,7 @@
 		OPCODE(o6_pushByteVar),
 		OPCODE(o6_pushWordVar),
 		/* 04 */
-		OPCODE(o6_invalid),
+		OPCODE(o7_getString),
 		OPCODE(o6_invalid),
 		OPCODE(o6_byteArrayRead),
 		OPCODE(o6_wordArrayRead),
@@ -419,12 +419,26 @@
 	push(_objs[objnum].y_pos);
 }
 
+void ScummEngine_v7he::o7_getString() {
+	int len;
+	
+	len = resStrLen(_scriptPointer);
+	warning("stub o7_getString(\"%s\")", _scriptPointer);
+	_scriptPointer += len;
+	fetchScriptWord();
+	fetchScriptWord();
+}
+
 void ScummEngine_v7he::o7_unknownFA() {
 	int len, a = fetchScriptByte();
 	
-	len = resStrLen(_scriptPointer);
-	warning("stub o7_unknownFA(%d, \"%s\")", a, _scriptPointer);
-	_scriptPointer += len + 1;
+	if (_heversion <= 71) {
+		int len = resStrLen(_scriptPointer);
+		warning("stub o7_unknownFA(%d, \"%s\")", a, _scriptPointer);
+		_scriptPointer += len + 1;
+	} else {
+		warning("stub o7_unknownFA(%d)", a);
+	}
 }
 
 void ScummEngine_v7he::o7_stringLen() {