[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.293.2.18,1.293.2.19

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	script_v6.cpp 
Log Message:

Revert opcode E4 back to warning.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.293.2.18
retrieving revision 1.293.2.19
diff -u -d -r1.293.2.18 -r1.293.2.19
--- script_v6.cpp	24 Jul 2004 07:14:26 -0000	1.293.2.18
+++ script_v6.cpp	24 Jul 2004 08:55:37 -0000	1.293.2.19
@@ -3077,43 +3077,7 @@
 }
 
 void ScummEngine_v6::o6_setBoxSet() {
-	// Disable for now, crashes fbear.
-	return;
-
-	int arg = pop();
-	const byte *room = getResourceAddress(rtRoom, _roomResource);
-	const byte *boxd = NULL, *boxm = NULL;
-	int32 dboxSize, mboxSize;
-	int i;
-
-	ResourceIterator boxds(room, false);
-	for (i = 0; i < arg; i++)
-		boxd = boxds.findNext(MKID('BOXD'));
-
-	if (!boxd)
-		error("ScummEngine_v6::o6_setBoxSet: Can't find dboxes for set %d", arg);
-
-	dboxSize = READ_BE_UINT32(boxd + 4);
-	byte *matrix = createResource(rtMatrix, 2, dboxSize);
-
-	assert(matrix);
-	memcpy(matrix, boxd, dboxSize);
-
-	ResourceIterator boxms(room, false);
-	for (i = 0; i < arg; i++)
-		boxm = boxms.findNext(MKID('BOXM'));
-
-	if (!boxm)
-		error("ScummEngine_v6::o6_setBoxSet: Can't find mboxes for set %d", arg);
-
-	mboxSize = READ_BE_UINT32(boxm + 4);
-	matrix = createResource(rtMatrix, 1, mboxSize);
-
-	assert(matrix);
-	memcpy(matrix, boxm, mboxSize);
-
-	if (_version == 7)
-		putActors();
+	warning("o6_unknownE4(%d) stub", pop());
 }
 
 void ScummEngine_v6::decodeParseString(int m, int n) {