[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.3,2.4 script_v90he.cpp,2.88,2.89

Travis Howell kirben at users.sourceforge.net
Sat Oct 9 16:47:14 CEST 2004


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

Modified Files:
	script_v100he.cpp script_v90he.cpp 
Log Message:

Fill in a few more case stubs.


Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- script_v100he.cpp	9 Oct 2004 16:10:53 -0000	2.3
+++ script_v100he.cpp	9 Oct 2004 23:45:04 -0000	2.4
@@ -809,7 +809,8 @@
 }
 
 void ScummEngine_v100he::o100_unknown28() {
-	// Incomplete
+	byte string[260];
+
 	byte subOp = fetchScriptByte();
 
 	switch (subOp) {
@@ -826,8 +827,61 @@
 		pop();
 		pop();
 		break;
+	case 38:
+		switch (pop()) {
+		case 1:
+			pop();
+			pop();
+			break;
+		case 2:
+			pop();
+			break;
+		case 3:
+			pop();
+			break;
+		case 4:
+			pop();
+			break;
+		case 5:
+			break;
+		case 6:
+			pop();
+			break;
+		case 7:
+			pop();
+			break;
+		case 8:
+			pop();
+			break;
+		default:
+			error("o100_unknown28 subOp 38: Unknown case %d", subOp);
+		}
+		break;
+	case 40:
+		pop();
+		break;
+	case 49:
+		pop();
+		pop();
+		break;
+	case 52:
+		copyScriptString(string);
+		break;
 	case 53:
 		break;
+	case 54:
+		pop();
+		pop();
+		break;
+	case 59:
+		pop();
+		break;
+	case 60:
+		pop();
+		pop();
+		break;
+	case 89:
+		break;
 	default:
 		error("o100_unknown28: Unknown case %d", subOp);
 	}
@@ -1336,27 +1390,98 @@
 }
 
 void ScummEngine_v100he::o100_unknown25() {
-	// Incomplete
 	int args[16];
 
 	byte subOp = fetchScriptByte();
-	subOp -= 3;
 
 	switch (subOp) {
+	case 3:
+		pop();
+		break;
+	case 4:
+		pop();
+		break;
+	case 7:
+		pop();
+		break;
+	case 16:
+		getStackList(args, ARRAYSIZE(args));
+		pop();
+		break;
+	case 26:
+		pop();
+		break;
 	case 30:
+		pop();
+		break;
+	case 31:
+		pop();
+		break;
+	case 32:
+		pop();
+		break;
+	case 33:
 		getStackList(args, ARRAYSIZE(args));
 		pop();
 		pop();
 		pop();
 		pop();
 		break;
-	case 36:
+	case 38:
 		pop();
 		break;
-	case 37:
+	case 39:
 		pop();
 		break;
-	case 81:
+	case 40:
+		pop();
+		break;
+	case 48:
+		pop();
+		break;
+	case 54:
+		pop();
+		pop();
+		break;
+	case 57:
+		pop();
+		break;
+	case 59:
+		pop();
+		break;
+	case 60:
+		pop();
+		pop();
+		break;
+	case 65:
+		pop();
+		break;
+	case 70:
+		pop();
+		break;
+	case 73:
+		pop();
+		break;
+	case 75:
+		pop();
+		break;
+	case 76:
+		pop();
+		break;
+	case 82:
+		pop();
+		break;
+	case 83:
+		pop();
+		pop();
+		break;
+	case 84:
+		pop();
+		break;
+	case 85:
+		pop();
+		break;
+	case 86:
 		pop();
 		break;
 	default:

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.88
retrieving revision 2.89
diff -u -d -r2.88 -r2.89
--- script_v90he.cpp	9 Oct 2004 16:41:35 -0000	2.88
+++ script_v90he.cpp	9 Oct 2004 23:45:04 -0000	2.89
@@ -1512,11 +1512,17 @@
 
 
 void ScummEngine_v90he::o90_unknownA5() {
+	byte string[80];
+	int a;
+
 	int subOp = fetchScriptByte();
 
 	switch (subOp) {
 	case 42:
-		if (pop() - 1 == 0)
+		a = pop();
+		if (a == 2)
+			copyScriptString(string);
+		else if (a == 1)
 			pop();
 		break;
 	case 57:





More information about the Scummvm-git-logs mailing list