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

SCUMM: Introduced V12_X_MULTIPLIER and V12_Y_MULTIPLIER to make it a bit easier to find spots where we convert between C64-style coordinates and pixel coordinates (but beware, this probably doesnt't cover all relevant instances)

Browse source 
svn-id: r24384
This commit is contained in:
Max Horn 2006-10-19 00:26:55 +00:00
parent 5148dbb3fb
commit a0b9f78bd3
6 changed files with 55 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

32
engines/scumm/boxes.cpp
View file

@ -596,25 +596,25 @@ BoxCoords ScummEngine::getBoxCoordinates(int boxnum) {
SWAP(box->ll, box->lr);
}
} else if (_game.version == 0) {
box->ul.x = bp->c64.x1 * 8;
box->ul.y = bp->c64.y1 * 2;
box->ur.x = bp->c64.x2 * 8;
box->ur.y = bp->c64.y1 * 2;
box->ul.x = bp->c64.x1 * V12_X_MULTIPLIER;
box->ul.y = bp->c64.y1 * V12_Y_MULTIPLIER;
box->ur.x = bp->c64.x2 * V12_X_MULTIPLIER;
box->ur.y = bp->c64.y1 * V12_Y_MULTIPLIER;
box->ll.x = bp->c64.x1 * 8;
box->ll.y = bp->c64.y2 * 2;
box->lr.x = bp->c64.x2 * 8;
box->lr.y = bp->c64.y2 * 2;
box->ll.x = bp->c64.x1 * V12_X_MULTIPLIER;
box->ll.y = bp->c64.y2 * V12_Y_MULTIPLIER;
box->lr.x = bp->c64.x2 * V12_X_MULTIPLIER;
box->lr.y = bp->c64.y2 * V12_Y_MULTIPLIER;
} else if (_game.version <= 2) {
box->ul.x = bp->v2.ulx * 8;
box->ul.y = bp->v2.uy * 2;
box->ur.x = bp->v2.urx * 8;
box->ur.y = bp->v2.uy * 2;
box->ul.x = bp->v2.ulx * V12_X_MULTIPLIER;
box->ul.y = bp->v2.uy * V12_Y_MULTIPLIER;
box->ur.x = bp->v2.urx * V12_X_MULTIPLIER;
box->ur.y = bp->v2.uy * V12_Y_MULTIPLIER;
box->ll.x = bp->v2.llx * 8;
box->ll.y = bp->v2.ly * 2;
box->lr.x = bp->v2.lrx * 8;
box->lr.y = bp->v2.ly * 2;
box->ll.x = bp->v2.llx * V12_X_MULTIPLIER;
box->ll.y = bp->v2.ly * V12_Y_MULTIPLIER;
box->lr.x = bp->v2.lrx * V12_X_MULTIPLIER;
box->lr.y = bp->v2.ly * V12_Y_MULTIPLIER;
} else {
box->ul.x = (int16)READ_LE_UINT16(&bp->old.ulx);
box->ul.y = (int16)READ_LE_UINT16(&bp->old.uly);