[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.131,2.132 script_v6he.cpp,2.5,2.6

[Travis Howell]

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

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

More stubs


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.131
retrieving revision 2.132
diff -u -d -r2.131 -r2.132
--- intern.h	7 Feb 2004 03:10:22 -0000	2.131
+++ intern.h	7 Feb 2004 04:11:40 -0000	2.132
@@ -589,9 +589,11 @@
 	void o6_unknownE4();
 	void o6_seekFile();
 	void o6_localizeArray();
+	void o6_unknownEE();
 	void o6_unknownFA();
 	void o6_unknownEA();
 	void o6_readINI();
+	void o6_unknownF9();
 };
 
 class ScummEngine_v7 : public ScummEngine_v6 {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- script_v6he.cpp	7 Feb 2004 03:10:22 -0000	2.5
+++ script_v6he.cpp	7 Feb 2004 04:11:40 -0000	2.6
@@ -346,7 +346,7 @@
 		/* EC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_unknownEE),
 		OPCODE(o6_invalid),
 		/* F0 */
 		OPCODE(o6_invalid),
@@ -360,7 +360,7 @@
 		OPCODE(o6_invalid),
 		/* F8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_unknownF9),
 		OPCODE(o6_unknownFA),
 		OPCODE(o6_invalid),
 		/* FC */
@@ -1187,6 +1187,12 @@
 	warning("unknownEA_func(%d, %d, %d, %d, %d) stub", a, b, c, d, e);
 }
 
+void ScummEngine_v6he::o6_unknownEE() {
+	int a;
+	a = pop();
+	loadPtrToResource(rtVerb, _curVerbSlot, getStringAddress(a));
+}
+
 void ScummEngine_v6he::o6_readINI() {
 	int len;
 
@@ -1208,8 +1214,29 @@
 	}
 }
 
+void ScummEngine_v6he::o6_unknownF9() {
+	// File related
+	int len, r;
+	byte filename[100];
+
+	_msgPtrToAdd = filename;
+	_messagePtr = _scriptPointer;
+	addMessageToStack(_messagePtr);
+
+	len = resStrLen(_scriptPointer);
+	_scriptPointer += len + 1;
+
+	for (r = strlen((char*)filename); r != 0; r--) {
+		if (filename[r - 1] == '\\')
+			break;
+	}
+
+	warning("stub o6_unknownF9(\"%s\")", filename + r);
+}
+
 void ScummEngine_v6he::decodeParseString(int m, int n) {
 	byte b;
+	int c;
 
 	b = fetchScriptByte();
 
@@ -1263,6 +1290,14 @@
 		}
 		return;
 	case 0xF9:
+		c = pop();
+		if (c == 1) {
+			_string[m].color = pop();
+		} else {	
+			push(c);
+			int args[16];
+			getStackList(args, ARRAYSIZE(args));
+		}
 		warning("decodeParseString case 0xF9 stub");
 		return;
 	case 0xFE: