[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.391,2.392 script_v100he.cpp,2.86,2.87

kirben kirben at users.sourceforge.net
Sat Mar 12 19:24:08 CET 2005


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

Modified Files:
	intern.h script_v100he.cpp 
Log Message:

Scripts flags difference in HE100 needed in a few more opcodes.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.391
retrieving revision 2.392
diff -u -d -r2.391 -r2.392
--- intern.h	12 Mar 2005 13:38:41 -0000	2.391
+++ intern.h	13 Mar 2005 03:23:34 -0000	2.392
@@ -1082,6 +1082,8 @@
 	void o100_loadSBNG();
 	void o100_dim2dim2Array();
 	void o100_paletteOps();
+	void o100_jumpToScriptUnk();
+	void o100_startScriptUnk();
 	void o100_redimArray();
 	void o100_roomOps();
 	void o100_startSound();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.86
retrieving revision 2.87
diff -u -d -r2.86 -r2.87
--- script_v100he.cpp	12 Mar 2005 04:16:57 -0000	2.86
+++ script_v100he.cpp	13 Mar 2005 03:23:35 -0000	2.87
@@ -152,8 +152,8 @@
 		OPCODE(o6_printSystem),
 		/* 58 */
 		OPCODE(o6_printCursor),
-		OPCODE(o90_jumpToScriptUnk),
-		OPCODE(o90_startScriptUnk),
+		OPCODE(o100_jumpToScriptUnk),
+		OPCODE(o100_startScriptUnk),
 		OPCODE(o6_pseudoRoom),
 		/* 5C */
 		OPCODE(o6_pushByte),
@@ -1517,6 +1517,31 @@
 	debug(1, "o100_paletteOps stub (%d)", subOp);
 }
 
+void ScummEngine_v100he::o100_jumpToScriptUnk() {
+	int args[25];
+	int script, cycle;
+	byte flags;
+
+	getStackList(args, ARRAYSIZE(args));
+	cycle = pop();
+	script = pop();
+	flags = fetchScriptByte();
+	stopObjectCode();
+	runScript(script, (flags == 128 || flags == 129), (flags == 130 || flags == 129), args, cycle);
+}
+
+void ScummEngine_v100he::o100_startScriptUnk() {
+	int args[25];
+	int script, cycle;
+	byte flags;
+
+	getStackList(args, ARRAYSIZE(args));
+	cycle = pop();
+	script = pop();
+	flags = fetchScriptByte();
+	runScript(script, (flags == 128 || flags == 129), (flags == 130 || flags == 129), args, cycle);
+}
+
 void ScummEngine_v100he::o100_redimArray() {
 	int newX, newY;
 	newY = pop();





More information about the Scummvm-git-logs mailing list