[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.255,2.256 script_v72he.cpp,2.101,2.102 script_v80he.cpp,2.28,2.29 script_v90he.cpp,2.37,2.38

Travis Howell kirben at users.sourceforge.net
Fri Sep 17 04:23:21 CEST 2004


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

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

Correct and rename opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.255
retrieving revision 2.256
diff -u -d -r2.255 -r2.256
--- intern.h	17 Sep 2004 05:43:36 -0000	2.255
+++ intern.h	17 Sep 2004 11:20:36 -0000	2.256
@@ -721,7 +721,7 @@
 	void o72_wordArrayIndexedRead();
 	void o72_wordArrayWrite();
 	void o72_wordArrayIndexedWrite();
-	void o72_compareStackList();
+	void o72_isAnyOf();
 	void o72_unknown50();
 	void o72_findObjectWithClassOf();
 	void o72_wordArrayInc();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.101
retrieving revision 2.102
diff -u -d -r2.101 -r2.102
--- script_v72he.cpp	17 Sep 2004 05:43:37 -0000	2.101
+++ script_v72he.cpp	17 Sep 2004 11:20:37 -0000	2.102
@@ -78,7 +78,7 @@
 		OPCODE(o6_land),
 		OPCODE(o6_lor),
 		OPCODE(o6_pop),
-		OPCODE(o72_compareStackList),
+		OPCODE(o72_isAnyOf),
 		/* 1C */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -664,18 +664,17 @@
 	push(readArray(fetchScriptWord(), idx, base));
 }
 
-void ScummEngine_v72he::o72_compareStackList() {
-	int args[128], i;
+void ScummEngine_v72he::o72_isAnyOf() {
+	int args[128], i = 0;
 	int num = getStackList(args, ARRAYSIZE(args));
 	int value = pop();
 
-	if (num) {
-		for (i = 1; i < num; i++) {
-			if (args[i] == value) {
-				push(1);
-				return;
-			}
+	while (i < num) {
+		if (args[i] == value) {
+			push(1);
+			return;
 		}
+		i++;
 	}
 
 	push(0);

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- script_v80he.cpp	17 Sep 2004 05:43:37 -0000	2.28
+++ script_v80he.cpp	17 Sep 2004 11:20:37 -0000	2.29
@@ -78,7 +78,7 @@
 		OPCODE(o6_land),
 		OPCODE(o6_lor),
 		OPCODE(o6_pop),
-		OPCODE(o72_compareStackList),
+		OPCODE(o72_isAnyOf),
 		/* 1C */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -d -r2.37 -r2.38
--- script_v90he.cpp	17 Sep 2004 05:43:37 -0000	2.37
+++ script_v90he.cpp	17 Sep 2004 11:20:37 -0000	2.38
@@ -78,7 +78,7 @@
 		OPCODE(o6_land),
 		OPCODE(o6_lor),
 		OPCODE(o6_pop),
-		OPCODE(o72_compareStackList),
+		OPCODE(o72_isAnyOf),
 		/* 1C */
 		OPCODE(o90_unknown1C),
 		OPCODE(o90_getLT),





More information about the Scummvm-git-logs mailing list