[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.243,2.244 script_v72he.cpp,2.84,2.85 script_v90he.cpp,2.28,2.29

Travis Howell kirben at users.sourceforge.net
Sun Sep 12 22:26:19 CEST 2004


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

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

Add Missing pop


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.243
retrieving revision 2.244
diff -u -d -r2.243 -r2.244
--- intern.h	13 Sep 2004 04:45:21 -0000	2.243
+++ intern.h	13 Sep 2004 05:25:35 -0000	2.244
@@ -738,6 +738,7 @@
 	void o72_dimArray();
 	void o72_dim2dimArray();
 	void o72_unknownC1();
+	void o72_unknownCF();
 	void o72_drawWizImage();
 	void o72_shuffle();
 	void o72_jumpToScript();
@@ -829,6 +830,7 @@
 	void o90_unknown34();
 	void o90_unknown36();
 	void o90_unknown37();
+	void o90_unknown3A();
 	void o90_unknown9E();
 };
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -d -r2.84 -r2.85
--- script_v72he.cpp	13 Sep 2004 04:16:22 -0000	2.84
+++ script_v72he.cpp	13 Sep 2004 05:25:35 -0000	2.85
@@ -303,7 +303,7 @@
 		OPCODE(o6_pickOneOfDefault),
 		OPCODE(o6_stampObject),
 		OPCODE(o72_drawWizImage),
-		OPCODE(o6_invalid),
+		OPCODE(o72_unknownCF),
 		/* D0 */
 		OPCODE(o6_getDateTime),
 		OPCODE(o6_stopTalking),
@@ -1405,6 +1405,22 @@
 	}
 }
 
+void ScummEngine_v72he::o72_unknownCF() {
+	//ArrayHeader *ah;
+	byte string[255];
+
+	copyScriptString(string);
+	int len = resStrLen(string) + 1;
+
+	writeVar(0, 0);
+	//ah = defineArray(0, kStringArray, 0, 0, 0, len);
+	defineArray(0, kStringArray, 0, 0, 0, len);
+	writeArray(0, 0, 0, 0);
+	//memcpy(ah->data, string, len);
+
+	push(readVar(0));
+}
+
 void ScummEngine_v72he::shuffleArray(int num, int minIdx, int maxIdx) {
 	int range = maxIdx - minIdx;
 	int count = range * 2;
@@ -1964,10 +1980,11 @@
 }
 
 void ScummEngine_v72he::o72_unknownF8() {
-	int a = fetchScriptByte();
+	int id = pop();
+	byte subOp = fetchScriptByte();
 	push(1);
 
-	debug(1,"stub o72_unknownF8(%d)", a);
+	debug(1,"stub o72_unknownF8: subOp %d, id %d", subOp, id);
 }
 
 void ScummEngine_v72he::o72_setFilePath() {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- script_v90he.cpp	13 Sep 2004 04:45:21 -0000	2.28
+++ script_v90he.cpp	13 Sep 2004 05:25:35 -0000	2.29
@@ -117,7 +117,7 @@
 		/* 38 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o90_unknown3A),
 		OPCODE(o6_invalid),
 		/* 3C */
 		OPCODE(o6_invalid),
@@ -887,6 +887,25 @@
 	debug(1,"o90_unknown37 stub");
 }
 
+void ScummEngine_v90he::o90_unknown3A() {
+	// Array related
+	int subOp = fetchScriptByte();
+
+	switch (subOp) {
+		case 129:
+			fetchScriptWord();
+			pop();
+			pop();
+			pop();
+			pop();
+			pop();
+			break;
+		default:
+			error("o90_unknown3A: Unknown case %d", subOp);
+	}
+	debug(1,"o90_unknown3A stub (%d)", subOp);
+}
+
 void ScummEngine_v90he::o90_unknown9E() {
 	int subOp = fetchScriptByte();
 	subOp -= 57;





More information about the Scummvm-git-logs mailing list