[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.277,2.278 script_v80he.cpp,2.42,2.43 script_v90he.cpp,2.64,2.65 scumm.cpp,1.242,1.243

[Travis Howell]

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

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

Add/correct opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.277
retrieving revision 2.278
diff -u -d -r2.277 -r2.278
--- intern.h	1 Oct 2004 23:15:48 -0000	2.277
+++ intern.h	1 Oct 2004 23:56:39 -0000	2.278
@@ -896,6 +896,7 @@
 	void o90_unknown3A();
 	void o90_unknown94();
 	void o90_unknown9E();
+	void o90_unknownA5();
 	void o90_getActorAnimProgress();
 	void o90_unknownCF();
 };

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- script_v80he.cpp	29 Sep 2004 11:25:21 -0000	2.42
+++ script_v80he.cpp	1 Oct 2004 23:56:39 -0000	2.43
@@ -33,7 +33,6 @@
 #include "scumm/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/verbs.h"
 
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
@@ -230,7 +229,7 @@
 		OPCODE(o6_findInventory),
 		OPCODE(o6_getInventoryCount),
 		/* 94 */
-		OPCODE(o6_getVerbFromXY),
+		OPCODE(o6_invalid),
 		OPCODE(o6_beginOverride),
 		OPCODE(o6_endOverride),
 		OPCODE(o6_setObjectName),
@@ -242,7 +241,7 @@
 		/* 9C */
 		OPCODE(o72_roomOps),
 		OPCODE(o72_actorOps),
-		OPCODE(o72_verbOps),
+		OPCODE(o6_invalid),
 		OPCODE(o6_getActorFromXY),
 		/* A0 */
 		OPCODE(o72_findObject),
@@ -251,7 +250,7 @@
 		OPCODE(o6_getVerbEntrypoint),
 		/* A4 */
 		OPCODE(o72_arrayOps),
-		OPCODE(o6_saveRestoreVerbs),
+		OPCODE(o6_invalid),
 		OPCODE(o6_drawBox),
 		OPCODE(o6_pop),
 		/* A8 */
@@ -514,11 +513,9 @@
 		break;
 	case 0x90:		// SO_CURSOR_ON Turn cursor on
 		_cursor.state = 1;
-		verbMouseOver(0);
 		break;
 	case 0x91:		// SO_CURSOR_OFF Turn cursor off
 		_cursor.state = 0;
-		verbMouseOver(0);
 		break;
 	case 0x92:		// SO_USERPUT_ON
 		_userPut = 1;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -d -r2.64 -r2.65
--- script_v90he.cpp	1 Oct 2004 23:15:48 -0000	2.64
+++ script_v90he.cpp	1 Oct 2004 23:56:39 -0000	2.65
@@ -33,7 +33,6 @@
 #include "scumm/resource_v7he.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
-#include "scumm/verbs.h"
 
 #include "sound/mididrv.h"
 #include "sound/mixer.h"
@@ -251,7 +250,7 @@
 		OPCODE(o6_getVerbEntrypoint),
 		/* A4 */
 		OPCODE(o72_arrayOps),
-		OPCODE(o6_saveRestoreVerbs),
+		OPCODE(o90_unknownA5),
 		OPCODE(o6_drawBox),
 		OPCODE(o6_pop),
 		/* A8 */
@@ -1163,15 +1162,38 @@
 	debug(1,"o90_unknown9E stub (%d)", subOp);
 }
 
+
+
+void ScummEngine_v90he::o90_unknownA5() {
+	int subOp = fetchScriptByte();
+
+	switch (subOp) {
+	case 42:
+		if (pop() - 1 == 0)
+			pop();
+		break;
+	case 57:
+		break;
+	default:
+		error("o90_unknownA5: Unknown case %d", subOp);
+	}
+
+	push(0);
+	debug(1,"o90_unknownA5 stub (%d)", subOp);
+}
+
 void ScummEngine_v90he::o90_getActorAnimProgress() {
 	Actor *a = derefActor(pop(), "o90_getActorAnimProgress");
 	push(a->getAnimProgress());
 }
 
 void ScummEngine_v90he::o90_unknownCF() {
-	byte name[256];
+	byte name[255];
 
 	copyScriptString(name);
+	writeVar(0, 0);
+	defineArray(0, kStringArray, 0, 0, 0, 0);
+	writeArray(0, 0, 0, 0);
 	push(readVar(0));
 }
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- scumm.cpp	1 Oct 2004 23:22:56 -0000	1.242
+++ scumm.cpp	1 Oct 2004 23:56:39 -0000	1.243
@@ -245,7 +245,6 @@
 	{"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, 72, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 
-	// There is also a Scummsys.90 version of puttzoo
 	{"puttzoo", "Putt-Putt Saves the Zoo", GID_HEGAME, 6, 72, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_MULTIPLE_VERSIONS, 0, 0},
 	{"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_HEGAME, 6, 72, MDT_NONE,