diff options
| author | James Brown | 2002-03-07 05:18:55 +0000 |
|---|---|---|
| committer | James Brown | 2002-03-07 05:18:55 +0000 |
| commit | fe991a1a064340edc71b8ce2f14f8291bc888a8e (patch) | |
| tree | 4846499f25d36609705b209b879e134b76c83cf8 /boxes.cpp | |
| parent | dea4adfd04e1ea1275e3da262cfb2ab54736576b (diff) | |
| download | scummvm-rg350-fe991a1a064340edc71b8ce2f14f8291bc888a8e.tar.gz scummvm-rg350-fe991a1a064340edc71b8ce2f14f8291bc888a8e.tar.bz2 scummvm-rg350-fe991a1a064340edc71b8ce2f14f8291bc888a8e.zip | |
Fix a very silly -incorrect- fix for walkboxen. Matrix is still wrong, tho :(
svn-id: r3678
Diffstat (limited to 'boxes.cpp')
| -rw-r--r-- | boxes.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
@@ -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) { |