[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.71,1.72

[Max Horn]

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

Modified Files:
	boxes.cpp 
Log Message:
cleanup

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- boxes.cpp	25 Dec 2003 18:21:03 -0000	1.71
+++ boxes.cpp	30 Dec 2003 21:18:29 -0000	1.72
@@ -475,17 +475,13 @@
 		// elaborate?
 
 		if (box->ul.y > box->ll.y && box->ur.y > box->lr.y) {
-			SWAP(box->ul.x, box->ll.x);
-			SWAP(box->ul.y, box->ll.y);
-			SWAP(box->ur.x, box->lr.x);
-			SWAP(box->ur.y, box->lr.y);
+			SWAP(box->ul, box->ll);
+			SWAP(box->ur, box->lr);
 		}
 
 		if (box->ul.x > box->ur.x && box->ll.x > box->lr.x) {
-			SWAP(box->ul.x, box->ur.x);
-			SWAP(box->ul.y, box->ur.y);
-			SWAP(box->ll.x, box->lr.x);
-			SWAP(box->ll.y, box->lr.y);
+			SWAP(box->ul, box->ur);
+			SWAP(box->ll, box->lr);
 		}
 	} else if (_version <= 2) {
 		box->ul.x = bp->v2.ulx * 8;
@@ -643,7 +639,7 @@
 	BoxCoords box;
 
 	getBoxCoordinates(b, &box);
-
+	
 	pt = closestPtOnLine(box.ul.x, box.ul.y, box.ur.x, box.ur.y, x, y);
 	dist = distanceFromPt(x, y, pt.x, pt.y);
 	if (dist < bestdist) {