[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.302,2.303 script_v72he.cpp,2.164,2.165 script_v90he.cpp,2.91,2.92

[Travis Howell]

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

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

Changes for mustard


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.302
retrieving revision 2.303
diff -u -d -r2.302 -r2.303
--- intern.h	10 Oct 2004 05:49:30 -0000	2.302
+++ intern.h	10 Oct 2004 06:32:01 -0000	2.303
@@ -881,6 +881,7 @@
 	void o90_startScriptUnk();
 	void o90_jumpToScriptUnk();
 	void o90_wizImageOps();
+	void o90_unknown24();
 	void o90_unknown25();
 	void o90_unknown26();
 	void o90_unknown27();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.164
retrieving revision 2.165
diff -u -d -r2.164 -r2.165
--- script_v72he.cpp	10 Oct 2004 05:49:30 -0000	2.164
+++ script_v72he.cpp	10 Oct 2004 06:32:01 -0000	2.165
@@ -1929,8 +1929,11 @@
 	mode = pop();
 	copyScriptString(filename);
 
-	// HACK bb2demo uses incorrect filename
-	if (!strcmp((char *)filename,".HE9")) {
+	// HACK Correct incorrect filenames
+	if (!strcmp((char *)filename,".he7")) {
+		memset(filename, 0, sizeof(filename));
+		sprintf((char *)filename, "%s.he7", _gameName.c_str());
+	} else if (!strcmp((char *)filename,".HE9")) {
 		memset(filename, 0, sizeof(filename));
 		sprintf((char *)filename, "%s.he9", _gameName.c_str());
 	}
@@ -2324,7 +2327,8 @@
 		i++;
 	}
 
-	push (i);
+	int r = (i) ? 1 : -1;
+	push (r);
 	debug(1,"o70_unknownF1 stub (%d, %d, %d)", id, id2, i);
 }
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.91
retrieving revision 2.92
diff -u -d -r2.91 -r2.92
--- script_v90he.cpp	10 Oct 2004 05:49:30 -0000	2.91
+++ script_v90he.cpp	10 Oct 2004 06:32:02 -0000	2.92
@@ -89,7 +89,7 @@
 		OPCODE(o90_atan2),
 		OPCODE(o90_getSegmentAngle),
 		/* 24 */
-		OPCODE(o6_invalid),
+		OPCODE(o90_unknown24),
 		OPCODE(o90_unknown25),
 		OPCODE(o90_unknown26),
 		OPCODE(o90_unknown27),
@@ -823,6 +823,31 @@
 	debug(1,"o90_wizImageOps stub (%d)", subOp);
 }
 
+void ScummEngine_v90he::o90_unknown24() {
+	byte subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 28:
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	case 29:
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	default:
+		error("o90_unknown24: Unknown case %d", subOp);
+	}
+	push(0);
+	debug(1,"o90_unknown24 stub (%d)", subOp);
+}
+
 void ScummEngine_v90he::o90_unknown25() {
 	int args[16];
 	byte subOp = fetchScriptByte();
@@ -1001,8 +1026,11 @@
 	case 91:
 		getStackList(args, ARRAYSIZE(args));
 		break;
-	case 105: // HE99+
+	case 105: // HE 99+
+		pop();
 		pop();
+		break;
+	case 106: // HE 99+
 		pop();
 		break;
 	case 124:
@@ -1059,6 +1087,10 @@
 	subOp -= 37;
 
 	switch (subOp) {
+	case 5:
+		pop();
+		pop();
+		break;
 	case 6:
 		pop();
 		break;