[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.153,2.154 script_v6he.cpp,2.36,2.37 script_v7he.cpp,2.8,2.9

[Travis Howell]

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

Modified Files:
	intern.h script_v6he.cpp script_v7he.cpp 
Log Message:

Move to HE6


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.153
retrieving revision 2.154
diff -u -d -r2.153 -r2.154
--- intern.h	2 Mar 2004 06:42:21 -0000	2.153
+++ intern.h	2 Mar 2004 10:22:55 -0000	2.154
@@ -595,6 +595,7 @@
 	void o6_readINI();
 	void o6_unknownF4();
 	void o6_unknownF9();
+	void o6_unknownFB();
 	void o6_readFilePos();
 };
 
@@ -621,7 +622,6 @@
 	/* Version 7 script opcodes */
 	void o7_objectX();
 	void o7_objectY();
-	void o7_unknownFB();
 };
 
 class ScummEngine_v7 : public ScummEngine_v6 {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -d -r2.36 -r2.37
--- script_v6he.cpp	2 Mar 2004 06:42:22 -0000	2.36
+++ script_v6he.cpp	2 Mar 2004 10:22:55 -0000	2.37
@@ -360,7 +360,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_unknownF9),
 		OPCODE(o6_unknownFA),
-		OPCODE(o6_invalid),
+		OPCODE(o6_unknownFB),
 		/* FC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -1393,6 +1393,31 @@
 	warning("stub o6_unknownF9(\"%s\")", filename + r);
 }
 
+void ScummEngine_v6he::o6_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;
+	}
+	warning("o6_unknownFB stub");
+}
+
 void ScummEngine_v6he::decodeParseString(int m, int n) {
 	byte b;
 	int c;

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- script_v7he.cpp	2 Mar 2004 06:42:22 -0000	2.8
+++ script_v7he.cpp	2 Mar 2004 10:22:55 -0000	2.9
@@ -360,7 +360,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_unknownF9),
 		OPCODE(o6_unknownFA),
-		OPCODE(o7_unknownFB),
+		OPCODE(o6_unknownFB),
 		/* FC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -406,29 +406,4 @@
 	push(_objs[objnum].y_pos);
 }
 
-void ScummEngine_v7he::o7_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;
-	}
-	warning("o7_unknownFB stub");
-}
-
 } // End of namespace Scumm