libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 02:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

undoing my last box change - with the last change in actor.cpp, this should make MM boxes work properly and fix one or multiple of the open MM bugs

Browse Source 
svn-id: r8953
This commit is contained in:
Max Horn 2003-07-12 18:46:33 +00:00
parent fd82895ff5
commit bc5dbf8e66
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scumm/boxes.cpp
View File

@ -356,25 +356,15 @@ void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
SWAP(box->ll.y, box->lr.y);
}
} else if (_version <= 2) {
// We have to adjust the x/y values of the walk box, since the coordinates
// given in the data files are *character* coordinates. Each character is
// 8 pixels wide and 2 pixels high. To compute the leftmost *pixel*
// coordinate of the walkbox, we just multiply the left most char-x by 8.
// For the rightmost, however, we multiply by 8 and then add 7 - to account
// for the fact that the character has a width of 8 pixels.
// We proceeed likewise for the y coordinates.
box->ul.x = bp->v2.ulx * 8;
box->ul.y = bp->v2.uy * 2;
box->ur.x = bp->v2.urx * 8 + 7;
box->ur.x = bp->v2.urx * 8;
box->ur.y = bp->v2.uy * 2;
box->ll.x = bp->v2.llx * 8;
box->ll.y = bp->v2.ly * 2 + 1;
box->lr.x = bp->v2.lrx * 8 + 7;
box->lr.y = bp->v2.ly * 2 + 1;
box->ll.y = bp->v2.ly * 2;
box->lr.x = bp->v2.lrx * 8;
box->lr.y = bp->v2.ly * 2;
} else {
box->ul.x = (int16)READ_LE_UINT16(&bp->old.ulx);
box->ul.y = (int16)READ_LE_UINT16(&bp->old.uly);