[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.221,2.222 script_v72he.cpp,2.54,2.55 script_v80he.cpp,2.2,2.3 script_v90he.cpp,2.2,2.3

[Travis Howell]

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

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

More stubs


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.221
retrieving revision 2.222
diff -u -d -r2.221 -r2.222
--- intern.h	6 Sep 2004 01:19:38 -0000	2.221
+++ intern.h	6 Sep 2004 01:54:24 -0000	2.222
@@ -778,6 +778,7 @@
 	virtual const char *getOpcodeDesc(byte i);
 	
 	/* HE version 80 script opcodes */
+	void o80_unknown49();
 	void o80_setState();
 };
 

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.54
retrieving revision 2.55
diff -u -d -r2.54 -r2.55
--- script_v72he.cpp	6 Sep 2004 01:19:38 -0000	2.54
+++ script_v72he.cpp	6 Sep 2004 01:54:24 -0000	2.55
@@ -850,8 +850,14 @@
 
 	switch (b) {
 	case 21:
-		// HE 7.3 (Pajama Sam onwards)
+		// HE 80 (Pajama Sam onwards)
 		k = getStackList(args, ARRAYSIZE(args));
+		debug(1,"o72_actorOps: case 21 (%d)", k);
+		break;
+	case 24:
+		// HE 80 (Pajama Sam onwards)
+		k = pop();
+		debug(1,"o72_actorOps: case 24 (%d)", k);
 		break;
 	case 64:
 		_actorClipOverride.bottom = pop();

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- script_v80he.cpp	6 Sep 2004 01:10:31 -0000	2.2
+++ script_v80he.cpp	6 Sep 2004 01:54:24 -0000	2.3
@@ -136,7 +136,7 @@
 		OPCODE(o72_wordArrayWrite),
 		/* 48 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o80_unknown49),
 		OPCODE(o6_invalid),
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
@@ -378,6 +378,14 @@
 	return _opcodesV80he[i].desc;
 }
 
+void ScummEngine_v80he::o80_unknown49() {
+	int a = pop();
+	int b = pop();
+
+	push (0);
+	debug(1,"o80_unknown49 stub (%d, %d)", b, a);
+}
+
 void ScummEngine_v80he::o80_setState() {
 	int state = pop();
 	int obj = pop();

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- script_v90he.cpp	6 Sep 2004 01:19:38 -0000	2.2
+++ script_v90he.cpp	6 Sep 2004 01:54:24 -0000	2.3
@@ -136,7 +136,7 @@
 		OPCODE(o72_wordArrayWrite),
 		/* 48 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o80_unknown49),
 		OPCODE(o6_invalid),
 		OPCODE(o72_wordArrayIndexedWrite),
 		/* 4C */
@@ -185,7 +185,7 @@
 		OPCODE(o6_setClass),
 		OPCODE(o6_getState),
 		/* 70 */
-		OPCODE(o6_setState),
+		OPCODE(o80_setState),
 		OPCODE(o6_setOwner),
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
@@ -439,7 +439,7 @@
 	}
 	push(0);
 
-	debug(1,"o80_unknown25 stub (%d)", subOp);
+	debug(1,"o90_unknown25 stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_unknown26() {
@@ -447,6 +447,10 @@
 	int value = fetchScriptByte();
 	value -= 34;
 
+	if (value == 23) {
+		pop();
+	}
+
 	debug(1,"o90_unknown26 stub (%d)", value);
 }