Fix a very silly -incorrect- fix for walkboxen. Matrix is still wrong, tho :(

svn-id: r3678

3 files changed, 13 insertions, 22 deletions

diff --git a/boxes.cpp b/boxes.cpp
index 79ca9e17fb..c21e7ffd25 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -116,25 +116,15 @@ bool Scumm::checkXYInBoxBounds(int b, int x, int y) {
 
 void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
 	Box *bp = getBoxBaseAddr(boxnum);
-	if(_features & GF_NO_SCALLING){
-		box->ul.x = (int16)FROM_LE_16(bp->ulx);
-		box->ul.y = (int16)FROM_LE_16(bp->uly);
-		box->ur.x = (int16)FROM_LE_16(bp->urx);
-		box->ur.y = (int16)FROM_LE_16(bp->ury);
-		box->lr.x = (int16)FROM_LE_16(bp->llx);
-		box->lr.y = (int16)FROM_LE_16(bp->lly);
-		box->ll.x = (int16)FROM_LE_16(bp->lrx);
-		box->ll.y = (int16)FROM_LE_16(bp->lry);
-	} else {
-		box->ul.x = (int16)FROM_LE_16(bp->ulx);
-		box->ul.y = (int16)FROM_LE_16(bp->uly);
-		box->ur.x = (int16)FROM_LE_16(bp->urx);
-		box->ur.y = (int16)FROM_LE_16(bp->ury);
-		box->ll.x = (int16)FROM_LE_16(bp->llx);
-		box->ll.y = (int16)FROM_LE_16(bp->lly);
-		box->lr.x = (int16)FROM_LE_16(bp->lrx);
-		box->lr.y = (int16)FROM_LE_16(bp->lry);
-	}
+
+	box->ul.x = (int16)FROM_LE_16(bp->ulx);
+	box->ul.y = (int16)FROM_LE_16(bp->uly);
+	box->ur.x = (int16)FROM_LE_16(bp->urx);
+	box->ur.y = (int16)FROM_LE_16(bp->ury);
+	box->ll.x = (int16)FROM_LE_16(bp->llx);
+	box->ll.y = (int16)FROM_LE_16(bp->lly);
+	box->lr.x = (int16)FROM_LE_16(bp->lrx);
+	box->lr.y = (int16)FROM_LE_16(bp->lry);
 }
 
 uint Scumm::distanceFromPt(int x, int y, int ptx, int pty) {
diff --git a/debug.cpp b/debug.cpp
index 3f5d0a34b4..953d6e516d 100644
--- a/debug.cpp
+++ b/debug.cpp
@@ -111,6 +111,7 @@ bool ScummDebugger::do_command() {
 			int num, i; BoxCoords box;		
 			num = _s->getNumBoxes();
 			for (i=0; i<num; i++) {
+				printf("bt %d\n", i);
 				BoxTest(i);
 				_s->getBoxCoordinates(i, &box);
 				printf("%d: [%d x %d] [%d x %d] [%d x %d] [%d x %d]\n", i, 
diff --git a/sdl.cpp b/sdl.cpp
index c8332c5326..b73f7bb9e4 100644
--- a/sdl.cpp
+++ b/sdl.cpp
@@ -918,9 +918,9 @@ void BoxTest(int num) {
 	scumm.getBoxCoordinates(num,  &box);
 	rx1[0] = box.ul.x*2; ry1[0] = box.ul.y*2+32;
 	rx1[1] = box.ur.x*2; ry1[1] = box.ur.y*2+32;
-	rx1[2] = box.lr.x*2; ry1[2] = box.lr.y*2+32;
-	rx1[3] = box.ll.x*2; ry1[3] = box.ll.y*2+32;
-
+	rx1[2] = box.ll.x*2; ry1[2] = box.ll.y*2+32;
+	rx1[3] = box.lr.x*2; ry1[3] = box.lr.y*2+32;
+	
 	filledPolygonColor(screen, &rx1[0], &ry1[0], 4, 255);
 	SDL_UpdateRect(screen, 0,0,0,0);