[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.60,1.61 intern.h,2.40,2.41

Jonathan Gray khalek at users.sourceforge.net
Thu Feb 20 16:43:06 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20210

Modified Files:
	script_v6.cpp intern.h 
Log Message:
add o6_shuffle and stub for o6_localizeArray

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- script_v6.cpp	20 Feb 2003 21:05:56 -0000	1.60
+++ script_v6.cpp	21 Feb 2003 00:42:51 -0000	1.61
@@ -309,7 +309,7 @@
 		OPCODE(o6_getAnimateVariable),
 		OPCODE(o6_invalid),
 		/* D4 */
-		OPCODE(o6_invalid),
+		OPCODE(o6_shuffle),
 		OPCODE(o6_jumpToScript),
 		OPCODE(o6_band),
 		OPCODE(o6_bor),
@@ -326,7 +326,7 @@
 		/* E0 */
 		OPCODE(o6_unknownE0),
 		OPCODE(o6_invalid),
-		OPCODE(o6_invalid),
+		OPCODE(o6_localizeArray),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_invalid),
@@ -2972,6 +2972,10 @@
 	};
 }
 
+void Scumm_v6::o6_shuffle() {
+	sub_FEE_7822(fetchScriptWord(), pop(), pop());
+}
+
 void Scumm_v6::o6_pickVarRandom() {
 	warning("void Scumm_v6::o6_pickVarRandom()");
 
@@ -3047,6 +3051,10 @@
         }
         pop();
         return;
+}
+
+void Scumm_v6::o6_localizeArray() {
+	warning("stub localizeArray(%d)", pop());
 }
 
 void Scumm_v6::decodeParseString(int m, int n)

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.40
retrieving revision 2.41
diff -u -d -r2.40 -r2.41
--- intern.h	18 Feb 2003 23:59:53 -0000	2.40
+++ intern.h	21 Feb 2003 00:42:51 -0000	2.41
@@ -375,6 +375,8 @@
 	void o6_pickVarRandom();
 	void o6_getDateTime();
 	void o6_unknownE0();
+	void o6_localizeArray();
+	void o6_shuffle();
 
 	byte VAR_VIDEONAME;
 





More information about the Scummvm-git-logs mailing list