diff options
| author | Max Horn | 2007-02-04 01:24:43 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-04 01:24:43 +0000 |
| commit | be052be462c6d6b9f47b57b1169cc5e1e306d65f (patch) | |
| tree | 2cd26c677700d2aeae426a8584e4a6945a7e89df /engines/scumm/boxes.cpp | |
| parent | b2748810863483b6e249a262e6a18a805d1f3aa8 (diff) | |
| download | scummvm-rg350-be052be462c6d6b9f47b57b1169cc5e1e306d65f.tar.gz scummvm-rg350-be052be462c6d6b9f47b57b1169cc5e1e306d65f.tar.bz2 scummvm-rg350-be052be462c6d6b9f47b57b1169cc5e1e306d65f.zip | |
Rewrote the actor walk code for SCUMM V0-V2 games: Now it uses the C64 character coordinates internally, not pixel coordinates. This should fix some walk bugs, but also might cause some regressions. Watch out
svn-id: r25370
Diffstat (limited to 'engines/scumm/boxes.cpp')
| -rw-r--r-- | engines/scumm/boxes.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp index 12e90b2d77..91752cfc34 100644 --- a/engines/scumm/boxes.cpp +++ b/engines/scumm/boxes.cpp @@ -240,7 +240,7 @@ void ScummEngine::setBoxScaleSlot(int box, int slot) { } int ScummEngine::getScale(int box, int x, int y) { - if (_game.features & GF_NO_SCALING) + if (_game.version <= 3) return 255; Box *ptr = getBoxBaseAddr(box); @@ -306,7 +306,7 @@ int ScummEngine::getScaleFromSlot(int slot, int x, int y) { } int ScummEngine::getBoxScale(int box) { - if (_game.features & GF_NO_SCALING) + if (_game.version <= 3) return 255; Box *ptr = getBoxBaseAddr(box); if (!ptr) @@ -600,25 +600,25 @@ BoxCoords ScummEngine::getBoxCoordinates(int boxnum) { SWAP(box->ll, box->lr); } } else if (_game.version == 0) { - 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 * 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; + box->ul.x = bp->c64.x1; + box->ul.y = bp->c64.y1; + box->ur.x = bp->c64.x2; + box->ur.y = bp->c64.y1; + + box->ll.x = bp->c64.x1; + box->ll.y = bp->c64.y2; + box->lr.x = bp->c64.x2; + box->lr.y = bp->c64.y2; } else if (_game.version <= 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 * 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; + box->ul.x = bp->v2.ulx; + box->ul.y = bp->v2.uy; + box->ur.x = bp->v2.urx; + box->ur.y = bp->v2.uy; + + box->ll.x = bp->v2.llx; + box->ll.y = bp->v2.ly; + box->lr.x = bp->v2.lrx; + box->lr.y = bp->v2.ly; } else { box->ul.x = (int16)READ_LE_UINT16(&bp->old.ulx); box->ul.y = (int16)READ_LE_UINT16(&bp->old.uly); |