[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.231,2.232 script_v72he.cpp,2.67,2.68 script_v7he.cpp,2.63,2.64 script_v80he.cpp,2.10,2.11 script_v90he.cpp,2.18,2.19

[Travis Howell]

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

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

Duplicate


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.231
retrieving revision 2.232
diff -u -d -r2.231 -r2.232
--- intern.h	9 Sep 2004 04:05:30 -0000	2.231
+++ intern.h	9 Sep 2004 04:44:46 -0000	2.232
@@ -762,7 +762,6 @@
 	void o72_unknownF8();
 	void o72_unknownF9();
 	void o72_unknownFA();
-	void o72_unknownFB();
 };
 
 class ScummEngine_v80he : public ScummEngine_v72he {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- script_v72he.cpp	9 Sep 2004 04:16:57 -0000	2.67
+++ script_v72he.cpp	9 Sep 2004 04:44:46 -0000	2.68
@@ -358,7 +358,7 @@
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_unknownF9),
 		OPCODE(o72_unknownFA),
-		OPCODE(o72_unknownFB),
+		OPCODE(o7_unknownFB),
 		/* FC */
 		OPCODE(o7_unknownFC),
 		OPCODE(o6_invalid),
@@ -1941,31 +1941,6 @@
 	debug(1,"o72_unknownFA: (%d) %s", id, name);
 }
 
-void ScummEngine_v72he::o72_unknownFB() {
-	byte b;
-	b = fetchScriptByte();
-
-	switch (b) {
-	case 246:
-	case 248:
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		pop();
-		break;
-	case 247:
-		pop();
-		pop();
-		break;
-	}
-	debug(1, "o72_unknownFB stub");
-}
-
 void ScummEngine_v72he::decodeParseString(int m, int n) {
 	byte b;
 	int i, color;

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.63
retrieving revision 2.64
diff -u -d -r2.63 -r2.64
--- script_v7he.cpp	8 Sep 2004 10:36:06 -0000	2.63
+++ script_v7he.cpp	9 Sep 2004 04:44:46 -0000	2.64
@@ -1005,12 +1005,10 @@
 }
 
 void ScummEngine_v7he::o7_unknownFB() {
-	byte b;
-	b = fetchScriptByte();
+	byte subOp = fetchScriptByte();
 
-	switch (b) {
+	switch (subOp) {
 	case 246:
-	case 248:
 		pop();
 		pop();
 		pop();
@@ -1025,6 +1023,19 @@
 		pop();
 		pop();
 		break;
+	case 248:
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		pop();
+		break;
+	default:
+		error("o7_unknownFB: default type %d", subOp);
 	}
 	debug(1,"o7_unknownFB stub");
 }

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- script_v80he.cpp	9 Sep 2004 04:05:31 -0000	2.10
+++ script_v80he.cpp	9 Sep 2004 04:44:46 -0000	2.11
@@ -358,7 +358,7 @@
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_unknownF9),
 		OPCODE(o72_unknownFA),
-		OPCODE(o72_unknownFB),
+		OPCODE(o7_unknownFB),
 		/* FC */
 		OPCODE(o7_unknownFC),
 		OPCODE(o6_invalid),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- script_v90he.cpp	9 Sep 2004 04:05:31 -0000	2.18
+++ script_v90he.cpp	9 Sep 2004 04:44:46 -0000	2.19
@@ -358,7 +358,7 @@
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_unknownF9),
 		OPCODE(o72_unknownFA),
-		OPCODE(o72_unknownFB),
+		OPCODE(o7_unknownFB),
 		/* FC */
 		OPCODE(o7_unknownFC),
 		OPCODE(o6_invalid),