[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.138,2.139 script_v6.cpp,1.302,1.303 script_v6he.cpp,2.15,2.16

Travis Howell kirben at users.sourceforge.net
Sun Feb 15 21:24:01 CET 2004


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

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

Rename opcode


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.138
retrieving revision 2.139
diff -u -d -r2.138 -r2.139
--- intern.h	11 Feb 2004 03:36:27 -0000	2.138
+++ intern.h	16 Feb 2004 05:15:16 -0000	2.139
@@ -521,7 +521,7 @@
 	void o6_pickVarRandom();
 	void o6_getDateTime();
 	void o6_unknownE1();
-	void o6_unknownE4();
+	void o6_set_box_set();
 	void o6_shuffle();
 
 	byte VAR_VIDEONAME;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- script_v6.cpp	16 Feb 2004 03:53:03 -0000	1.302
+++ script_v6.cpp	16 Feb 2004 05:15:16 -0000	1.303
@@ -334,7 +334,7 @@
 		OPCODE(o6_invalid),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
-		OPCODE(o6_unknownE4),
+		OPCODE(o6_set_box_set),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -3098,7 +3098,7 @@
 	push(area);
 }
 
-void ScummEngine_v6::o6_unknownE4() {
+void ScummEngine_v6::o6_set_box_set() {
 	int arg = pop();
 	const byte *room = getResourceAddress(rtRoom, _roomResource);
 	const byte *boxd = NULL, *boxm = NULL;
@@ -3109,7 +3109,7 @@
 		boxd = boxds.findNext(MKID('BOXD'));
 
 	if (!boxd)
-		error("ScummEngine_v6::o6_unknownE4: Can't find dboxes for set %d", arg);
+		error("ScummEngine_v6::o6_set_box_set: Can't find dboxes for set %d", arg);
 
 	dboxSize = READ_BE_UINT32(boxd + 4);
 	byte *matrix = createResource(rtMatrix, 2, dboxSize);
@@ -3122,7 +3122,7 @@
 		boxm = boxms.findNext(MKID('BOXM'));
 
 	if (!boxm)
-		error("ScummEngine_v6::o6_unknownE4: Can't find mboxes for set %d", arg);
+		error("ScummEngine_v6::o6_set_box_set: Can't find mboxes for set %d", arg);
 
 	mboxSize = READ_BE_UINT32(boxd + 4);
 	matrix = createResource(rtMatrix, 1, mboxSize);

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- script_v6he.cpp	13 Feb 2004 11:00:34 -0000	2.15
+++ script_v6he.cpp	16 Feb 2004 05:15:31 -0000	2.16
@@ -332,7 +332,7 @@
 		OPCODE(o6_localizeArray),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
-		OPCODE(o6_unknownE4),
+		OPCODE(o6_set_box_set),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),





More information about the Scummvm-git-logs mailing list