[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.220,2.221 script_v72he.cpp,2.53,2.54 script_v90he.cpp,2.1,2.2

Travis Howell kirben at users.sourceforge.net
Sun Sep 5 18:20:22 CEST 2004


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

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

Add back stub, in right place this time.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.220
retrieving revision 2.221
diff -u -d -r2.220 -r2.221
--- intern.h	6 Sep 2004 01:10:30 -0000	2.220
+++ intern.h	6 Sep 2004 01:19:38 -0000	2.221
@@ -801,6 +801,7 @@
 	
 	/* HE version 90 script opcodes */
 	void o90_unknown1C();
+	void o90_unknown25();
 	void o90_unknown26();
 };
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -d -r2.53 -r2.54
--- script_v72he.cpp	6 Sep 2004 01:00:18 -0000	2.53
+++ script_v72he.cpp	6 Sep 2004 01:19:38 -0000	2.54
@@ -706,7 +706,7 @@
 void ScummEngine_v72he::o72_unknown5A() {
 	int value = pop();
 	push(4);
-	warning("o72_unknown5A stub (%d)", value);
+	debug(1,"o72_unknown5A stub (%d)", value);
 }
 
 void ScummEngine_v72he::o72_wordArrayDec() {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- script_v90he.cpp	6 Sep 2004 00:58:40 -0000	2.1
+++ script_v90he.cpp	6 Sep 2004 01:19:38 -0000	2.2
@@ -91,7 +91,7 @@
 		OPCODE(o6_invalid),
 		/* 24 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o90_unknown25),
 		OPCODE(o90_unknown26),
 		OPCODE(o6_invalid),
 		/* 28 */
@@ -395,12 +395,59 @@
 	warning("o90_unknown1C stub (%d)", value);
 }
 
+void ScummEngine_v90he::o90_unknown25() {
+	int args[16];
+	int subOp = fetchScriptByte();
+	switch (subOp) {
+		case 30:
+		case 31:
+		case 32:
+		case 33:
+		case 34:
+		case 35:
+		case 36:
+		case 37:
+		case 38:
+		case 39:
+		case 43:
+		case 52:
+		case 63:
+		case 68:
+		case 82:
+		case 92:
+		case 97:
+		case 98:
+		case 124:
+			pop();
+			break;
+		case 42:
+		case 198:
+			pop();
+			pop();
+			break;
+		case 45:
+			pop();
+			pop();
+			pop();
+			break;
+		case 125:
+			getStackList(args, ARRAYSIZE(args));
+			pop();
+			break;
+		default:
+			error("o90_unknown25: Unknown case %d", subOp);
+	}
+	push(0);
+
+	debug(1,"o80_unknown25 stub (%d)", subOp);
+}
+
 void ScummEngine_v90he::o90_unknown26() {
 	// Incomplete
 	int value = fetchScriptByte();
 	value -= 34;
 
-	warning("o90_unknown26 stub (%d)", value);
+	debug(1,"o90_unknown26 stub (%d)", value);
 }
 
 } // End of namespace Scumm





More information about the Scummvm-git-logs mailing list