Should only copy data, not tag/size.

svn-id: r15343

2 files changed, 4 insertions, 9 deletions

diff --git a/TODO b/TODO
index de3e1865ca..f4548ed483 100644
--- a/TODO
+++ b/TODO
@@ -255,7 +255,6 @@ SCUMM
   - Add proper handling of sound looping in Humongous games
   - Add sound pitch support for piano keys in piano mini game of fbear (DOS)
   - Add rename/delete file support, to make file opcodes function correctly
-  - Fix o6_setboxset, only used when leaving basement in fbear
 * Humongous entertainment >= v7 titles:
   - Add support for song sync. in HE80+ games.
   - Add support for additional sound resources
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 1cc0756bc7..53ce1d3b6e 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -3071,10 +3071,6 @@ void ScummEngine_v6::o6_getPixel() {
 }
 
 void ScummEngine_v6::o6_setBoxSet() {
-	//FIXME Causes glitches and game to crash 
-	// Only used in fbear when leaving the basement
-	return;
-
 	int arg = pop() - 1;
 
 	const byte *room = getResourceAddress(rtRoom, _roomResource);
@@ -3089,11 +3085,11 @@ void ScummEngine_v6::o6_setBoxSet() {
 	if (!boxd)
 		error("ScummEngine_v6::o6_setBoxSet: Can't find dboxes for set %d", arg);
 
-	dboxSize = READ_BE_UINT32(boxd + 4);
+	dboxSize = READ_BE_UINT32(boxd + 4) - 8;
 	byte *matrix = createResource(rtMatrix, 2, dboxSize);
 
 	assert(matrix);
-	memcpy(matrix, boxd, dboxSize);
+	memcpy(matrix, boxd + 8, dboxSize);
 
 	ResourceIterator boxms(room, false);
 	for (i = 0; i < arg; i++)
@@ -3102,11 +3098,11 @@ void ScummEngine_v6::o6_setBoxSet() {
 	if (!boxm)
 		error("ScummEngine_v6::o6_setBoxSet: Can't find mboxes for set %d", arg);
 
-	mboxSize = READ_BE_UINT32(boxm + 4);
+	mboxSize = READ_BE_UINT32(boxm + 4) - 8;
 	matrix = createResource(rtMatrix, 1, mboxSize);
 
 	assert(matrix);
-	memcpy(matrix, boxm, mboxSize);
+	memcpy(matrix, boxm + 8, mboxSize);
 
 	if (_version == 7)
 		putActors();