From 8168c0b11d4fb45971e5b9a70bb07add4fa0cbe4 Mon Sep 17 00:00:00 2001
From: Vincent Hamm
Date: Fri, 22 Feb 2002 16:06:09 +0000
Subject: Fixed some boxes issues. Matrix is still buggy

svn-id: r3620
---
 boxes.cpp | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'boxes.cpp')

diff --git a/boxes.cpp b/boxes.cpp
index 2e053d1f28..79ca9e17fb 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -116,14 +116,25 @@ bool Scumm::checkXYInBoxBounds(int b, int x, int y) {
 
 void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
 	Box *bp = getBoxBaseAddr(boxnum);
-	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);
+	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);
+	}
 }
 
 uint Scumm::distanceFromPt(int x, int y, int ptx, int pty) {
-- 
cgit v1.2.3