thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some boxes issues. Matrix is still buggy

Browse source 
svn-id: r3620
This commit is contained in:
Vincent Hamm 2002-02-22 16:06:09 +00:00
parent f92ed783cb
commit 8168c0b11d
5 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
boxes.cpp
View file

@ -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) {