diff options
| author | Max Horn | 2003-12-30 21:18:29 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-30 21:18:29 +0000 |
| commit | 3230a203e480079c34ea94d1f016d81533a92792 (patch) | |
| tree | 5d74325a9e4c069bd33717ce9bca7b0667ce1c69 /scumm/boxes.cpp | |
| parent | 42c5524a02a61a13fcefdc5a7d3f187c5b048bee (diff) | |
| download | scummvm-rg350-3230a203e480079c34ea94d1f016d81533a92792.tar.gz scummvm-rg350-3230a203e480079c34ea94d1f016d81533a92792.tar.bz2 scummvm-rg350-3230a203e480079c34ea94d1f016d81533a92792.zip | |
cleanup
svn-id: r12038
Diffstat (limited to 'scumm/boxes.cpp')
| -rw-r--r-- | scumm/boxes.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index dd2c808fa3..7913910096 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -475,17 +475,13 @@ void ScummEngine::getBoxCoordinates(int boxnum, BoxCoords *box) { // 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 @@ int ScummEngine::getClosestPtOnBox(int b, int x, int y, int16& outX, int16& outY 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) { |