[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.44,1.45

[Max Horn]

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

Modified Files:
	boxes.cpp 
Log Message:
undoing my last box change - with the last change in actor.cpp, this should make MM boxes work properly and fix one or multiple of the open MM bugs

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- boxes.cpp	12 Jul 2003 12:40:20 -0000	1.44
+++ boxes.cpp	12 Jul 2003 18:46:33 -0000	1.45
@@ -356,25 +356,15 @@
 			SWAP(box->ll.y, box->lr.y);
 		}
 	} else if (_version <= 2) {
-		// We have to adjust the x/y values of the walk box, since the coordinates
-		// given in the data files are *character* coordinates. Each character is
-		// 8 pixels wide and 2 pixels high. To compute the leftmost *pixel*
-		// coordinate of the walkbox, we just multiply the left most char-x by 8.
-		// For the rightmost, however, we multiply by 8 and then add 7 - to account
-		// for the fact that the character has a width of 8 pixels.
-		// We proceeed likewise for the y coordinates.
-
 		box->ul.x = bp->v2.ulx * 8;
 		box->ul.y = bp->v2.uy * 2;
-		box->ur.x = bp->v2.urx * 8 + 7;
+		box->ur.x = bp->v2.urx * 8;
 		box->ur.y = bp->v2.uy * 2;
 	
 		box->ll.x = bp->v2.llx * 8;
-		box->ll.y = bp->v2.ly * 2 + 1;
-		box->lr.x = bp->v2.lrx * 8 + 7;
-		box->lr.y = bp->v2.ly * 2 + 1;
-		
-		
+		box->ll.y = bp->v2.ly * 2;
+		box->lr.x = bp->v2.lrx * 8;
+		box->lr.y = bp->v2.ly * 2;
 	} else {
 		box->ul.x = (int16)READ_LE_UINT16(&bp->old.ulx);
 		box->ul.y = (int16)READ_LE_UINT16(&bp->old.uly);