[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.264,2.265 script_v72he.cpp,2.113,2.114 script_v80he.cpp,2.34,2.35 script_v90he.cpp,2.47,2.48

[Max Horn]

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

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

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.264
retrieving revision 2.265
diff -u -d -r2.264 -r2.265
--- intern.h	20 Sep 2004 19:19:56 -0000	2.264
+++ intern.h	20 Sep 2004 19:48:08 -0000	2.265
@@ -756,7 +756,6 @@
 	void o72_unknownC1();
 	void o72_unknownCF();
 	void o72_drawWizImage();
-	void o72_shuffle();
 	void o72_jumpToScript();
 	void o72_openFile();
 	void o72_readFile();

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.113
retrieving revision 2.114
diff -u -d -r2.113 -r2.114
--- script_v72he.cpp	20 Sep 2004 19:19:56 -0000	2.113
+++ script_v72he.cpp	20 Sep 2004 19:48:08 -0000	2.114
@@ -310,7 +310,7 @@
 		OPCODE(o6_getAnimateVariable),
 		OPCODE(o6_invalid),
 		/* D4 */
-		OPCODE(o72_shuffle),
+		OPCODE(o6_shuffle),
 		OPCODE(o72_jumpToScript),
 		OPCODE(o6_band),
 		OPCODE(o6_bor),
@@ -1707,12 +1707,6 @@
 	push(readVar(0));
 }
 
-void ScummEngine_v72he::o72_shuffle() {
-	int b = pop();
-	int a = pop();
-	shuffleArray(fetchScriptWord(), a, b);
-}
-
 void ScummEngine_v72he::o72_jumpToScript() {
 	int args[16];
 	int script, flags;

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- script_v80he.cpp	20 Sep 2004 19:19:57 -0000	2.34
+++ script_v80he.cpp	20 Sep 2004 19:48:08 -0000	2.35
@@ -310,7 +310,7 @@
 		OPCODE(o6_getAnimateVariable),
 		OPCODE(o6_invalid),
 		/* D4 */
-		OPCODE(o72_shuffle),
+		OPCODE(o6_shuffle),
 		OPCODE(o72_jumpToScript),
 		OPCODE(o6_band),
 		OPCODE(o6_bor),

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- script_v90he.cpp	20 Sep 2004 19:19:57 -0000	2.47
+++ script_v90he.cpp	20 Sep 2004 19:48:08 -0000	2.48
@@ -310,7 +310,7 @@
 		OPCODE(o6_getAnimateVariable),
 		OPCODE(o6_invalid),
 		/* D4 */
-		OPCODE(o72_shuffle),
+		OPCODE(o6_shuffle),
 		OPCODE(o72_jumpToScript),
 		OPCODE(o6_band),
 		OPCODE(o6_bor),