[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.242,2.243 script_v7he.cpp,2.76,2.77 script_v80he.cpp,2.15,2.16 script_v90he.cpp,2.27,2.28

[Travis Howell]

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

Modified Files:
	intern.h script_v7he.cpp script_v80he.cpp script_v90he.cpp 
Log Message:

HE arcade game work a bit now.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.242
retrieving revision 2.243
diff -u -d -r2.242 -r2.243
--- intern.h	13 Sep 2004 02:09:35 -0000	2.242
+++ intern.h	13 Sep 2004 04:45:21 -0000	2.243
@@ -790,7 +790,8 @@
 	/* HE version 80 script opcodes */
 	void o80_unknown45();
 	void o80_unknown49();
-	void o80_unknown4D();
+	void o80_readConfigFile();
+	void o80_writeConfigFile();
 	void o80_cursorCommand();
 	void o80_setState();
 };

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.76
retrieving revision 2.77
diff -u -d -r2.76 -r2.77
--- script_v7he.cpp	13 Sep 2004 02:09:35 -0000	2.76
+++ script_v7he.cpp	13 Sep 2004 04:45:21 -0000	2.77
@@ -647,9 +647,7 @@
 			resid = _resourceMapper[resid & 0x7F];
 		unlock(rtRoom, resid);
 		break;
-	case 116:		// SO_CLEAR_HEAP
-		/* this is actually a scumm message */
-		error("clear heap not working yet");
+	case 116:
 		break;
 	case 117:		// SO_LOAD_CHARSET
 		resid = pop();

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- script_v80he.cpp	11 Sep 2004 03:10:31 -0000	2.15
+++ script_v80he.cpp	13 Sep 2004 04:45:21 -0000	2.16
@@ -141,8 +141,8 @@
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),
-		OPCODE(o80_unknown4D),
-		OPCODE(o6_invalid),
+		OPCODE(o80_readConfigFile),
+		OPCODE(o80_writeConfigFile),
 		OPCODE(o6_wordVarInc),
 		/* 50 */
 		OPCODE(o72_unknown50),
@@ -422,14 +422,14 @@
 	debug(1,"o80_unknown49 stub (%d, %d)", subOp, snd);
 }
 
-void ScummEngine_v80he::o80_unknown4D() {
-	byte option[128], option2[128], option3[256];
+void ScummEngine_v80he::o80_readConfigFile() {
+	byte name[128], section[128], filename[256];
 	int type, retval;
 
 	// we pretend that we don't have .ini file
-	copyScriptString(option);
-	copyScriptString(option2);
-	copyScriptString(option3);
+	copyScriptString(section);
+	copyScriptString(name);
+	copyScriptString(filename);
 	type = fetchScriptByte();
 
 	switch (type) {
@@ -444,9 +444,36 @@
 		push(retval); // var ID string
 		break;
 	default:
-		error("o80_unknown4D: default type %d", type);
+		error("o80_readConfigFile: default type %d", type);
+	}
+	debug(1, "o80_readConfigFile: Filename %s Section %s Name %s", filename, section, name);
+}
+
+void ScummEngine_v80he::o80_writeConfigFile() {
+	byte filename[256], section[256], name[256], string[1024];
+	int type, value;
+
+	// we pretend that we don't have .ini file
+	type = fetchScriptByte();
+
+	switch (type) {
+	case 6: // number
+		value = pop();
+		copyScriptString(section);
+		copyScriptString(name);
+		copyScriptString(filename);
+		debug(1,"o80_writeConfigFile: Filename %s Section %s Name %s Value %d", filename, section, name, value);
+		break;
+	case 7: // string
+		copyScriptString(string);
+		copyScriptString(section);
+		copyScriptString(name);
+		copyScriptString(filename);
+		debug(1,"o80_writeConfigFile: Filename %s Section %s Name %s String %s", filename, section, name, string);
+		break;
+	default:
+		error("o80_writeConfigFile: default type %d", type);
 	}
-	debug(1, "o80_unknown4D (%d) %s %s %s", type, option, option2, option3);
 }
 
 void ScummEngine_v80he::o80_cursorCommand() {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- script_v90he.cpp	12 Sep 2004 11:15:26 -0000	2.27
+++ script_v90he.cpp	13 Sep 2004 04:45:21 -0000	2.28
@@ -141,8 +141,8 @@
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
 		OPCODE(o6_invalid),
-		OPCODE(o80_unknown4D),
-		OPCODE(o6_invalid),
+		OPCODE(o80_readConfigFile),
+		OPCODE(o80_writeConfigFile),
 		OPCODE(o6_wordVarInc),
 		/* 50 */
 		OPCODE(o72_unknown50),