[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.104,2.105 script_v6.cpp,1.180,1.181

[Jonathan Gray]

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

Modified Files:
	intern.h script_v6.cpp 
Log Message:
add readINI stub (a HEv7 op)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- intern.h	18 Aug 2003 10:46:42 -0000	2.104
+++ intern.h	28 Aug 2003 15:23:22 -0000	2.105
@@ -514,6 +514,7 @@
 	void o6_shuffle();
 	void o6_unknownFA();
 	void o6_unknownEA();
+	void o6_readINI();
 
 	byte VAR_VIDEONAME;
 

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- script_v6.cpp	15 Aug 2003 03:15:41 -0000	1.180
+++ script_v6.cpp	28 Aug 2003 15:23:23 -0000	1.181
@@ -346,7 +346,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_readINI),
 		/* F4 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -3019,7 +3019,7 @@
 	edi = pop();
 	esi = pop();
 
-	if (edi == 0) {
+	if ((edi | esi) ==  0) {
 		eax = esi;
 		esi = edi;
 		edi = eax;
@@ -3042,6 +3042,17 @@
 	warning("unknownEA_func(%d, %d, %d, %d, %d) stub", a, b, c, d, e);
 }
 
+void Scumm_v6::o6_readINI() {
+	int len;
+
+	len = resStrLen(_scriptPointer);
+	warning("stub o6_readINI(\"%s\")", _scriptPointer);
+	_scriptPointer += len + 1;
+	pop();
+	push(0);
+	
+}
+
 void Scumm_v6::o6_localizeArray() {
 	warning("stub localizeArray(%d)", pop());
 }
@@ -3116,6 +3127,6 @@
 		_string[m].t_charset = _string[m].charset;
 		return;
 	default:
-		error("decodeParseString: default case");
+		error("decodeParseString: default case 0x%x", b);
 	}
 }